[JENKINS-65398] Terminology Changes

docs/home.md

@@ -13,7 +13,7 @@
 -->
 # Google OAuth Plugin Documentation
 
-This plugin implements the OAuth Credentials interfaces for surfacing [Google Service Accounts](https://cloud.google.com/iam/docs/understanding-service-accounts) to Jenkins. This plugin allows for the registration of Google Service Account Credentials with the Jenkins master, which can be used to interact with Google APIs.
+This plugin implements the OAuth Credentials interfaces for surfacing [Google Service Accounts](https://cloud.google.com/iam/docs/understanding-service-accounts) to Jenkins. This plugin allows for the registration of Google Service Account Credentials with the Jenkins controller, which can be used to interact with Google APIs.
 
 ## Google OAuth Credentials
 
@@ -23,7 +23,7 @@ This plugin surfaces two Credential types for generating OAuth credentials for a
     * You can create service accounts via the Google Developers Console, under APIs & auth → Credentials → Create new Client ID → Service account
     * The downloaded P12 key and the service account email address can then be used when adding the credential to Jenkins; or if you created a new JSON key, you can use that instead
 
-1. [Google Service Account from metadata](https://cloud.google.com/compute/docs/storing-retrieving-metadata) use this option for obtaining the service account information from Google Compute Engine metadata. This option is only available when the Jenkins master is run on a Google Compute Engine VM.
+1. [Google Service Account from metadata](https://cloud.google.com/compute/docs/storing-retrieving-metadata) use this option for obtaining the service account information from Google Compute Engine metadata. This option is only available when the Jenkins controller is run on a Google Compute Engine VM.
 
 ![drop-down image](images/dropdown.jpg)
 

src/main/java/com/google/jenkins/plugins/credentials/oauth/JsonServiceAccountConfig.java

@@ -76,8 +76,8 @@ public class JsonServiceAccountConfig extends ServiceAccountConfig {
   public JsonServiceAccountConfig() {}
 
   /**
-   * For being able to load credentials created with versions < 0.8 and backwards compatibility with
-   * external callers.
+   * For being able to load credentials created with versions < 0.8 and backwards compatibility
+   * with external callers.
    *
    * @param jsonKeyFile The uploaded JSON key file.
    * @param prevJsonKeyFile The path of the previous JSON key file.

src/main/java/com/google/jenkins/plugins/credentials/oauth/P12ServiceAccountConfig.java

@@ -72,8 +72,8 @@ public P12ServiceAccountConfig(String emailAddress) {
   }
 
   /**
-   * For being able to load credentials created with versions < 0.8 and backwards compatibility with
-   * external callers.
+   * For being able to load credentials created with versions < 0.8 and backwards compatibility
+   * with external callers.
    *
    * @param emailAddress The service account email address.
    * @param p12KeyFileUpload The uploaded p12 key file.

src/main/java/com/google/jenkins/plugins/credentials/oauth/RemotableGoogleCredentials.java

@@ -26,10 +26,10 @@
 import org.joda.time.DateTime;
 
 /**
- * As some implementations of {@link GoogleRobotCredentials} are bound to the master, this ephemeral
- * credential is remoted in place of those. The use case is basically that when a plugin needs to
- * remote credential C, with some requirement R, it would instead remote {@code C.forRemote(R)} to
- * instantiate one of these.
+ * As some implementations of {@link GoogleRobotCredentials} are bound to the controller, this
+ * ephemeral credential is remoted in place of those. The use case is basically that when a plugin
+ * needs to remote credential C, with some requirement R, it would instead remote {@code
+ * C.forRemote(R)} to instantiate one of these.
  *
  * <p>TODO(mattmoor): Consider ways to use channels to remove the time limitation that this has
  * (access token expires).