DOCSP-42514: kotlin user/pass placeholders (mongodb#169)

stephmarie17 · Aug 20, 2024 · 31cb0e9 · 31cb0e9
1 parent 4324743
commit 31cb0e9
Show file tree

Hide file tree

Showing 27 changed files with 51 additions and 50 deletions.
diff --git a/examples/src/test/kotlin/AuthTest.kt b/examples/src/test/kotlin/AuthTest.kt
@@ -47,7 +47,7 @@ internal class AuthTest {
     fun defaultConnectionStringTest() = runBlocking {
         // :replace-start: {
         //    "terms": {
-        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>\""
+        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>\""
         //    }
         // }
         // :snippet-start: default-cred-string
@@ -70,7 +70,7 @@ internal class AuthTest {
     fun scramSha256ConnectionStringTest() = runBlocking {
         // :replace-start: {
         //    "terms": {
-        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-256\""
+        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-256\""
         //    }
         // }
         // :snippet-start: scram-sha-256-string
@@ -93,7 +93,7 @@ internal class AuthTest {
     fun scramSha1ConnectionStringTest() = runBlocking {
         // :replace-start: {
         //    "terms": {
-        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-1\""
+        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-1\""
         //    }
         // }
         // :snippet-start: scram-sha-1-string
@@ -116,7 +116,7 @@ internal class AuthTest {
     fun x509ConnectionStringTest() = runBlocking {
         // :replace-start: {
         //    "terms": {
-        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-X509&tls=true\""
+        //       "CONNECTION_URI_PLACEHOLDER": "\"mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-X509&tls=true\""
         //    }
         // }
         // :snippet-start: x-509-string
@@ -137,8 +137,8 @@ internal class AuthTest {
 
     // :replace-start: {
     //    "terms": {
-    //       "USERNAME": "\"<username>\"",
-    //       "PASSWORD": "\"<password>\"",
+    //       "USERNAME": "\"<db_username>\"",
+    //       "PASSWORD": "\"<db_password>\"",
     //       "AUTH_DB": "\"<authenticationDb>\"",
     //       "HOSTNAME": "\"<hostname>\"",
     //       "PORT": "\"<port>\""

diff --git a/examples/src/test/kotlin/EnterpriseAuthTest.kt b/examples/src/test/kotlin/EnterpriseAuthTest.kt
@@ -13,6 +13,7 @@ import javax.naming.Context
 import javax.security.auth.Subject
 import javax.security.auth.login.LoginContext
 import kotlin.test.Ignore
+
 // :replace-start: {
 //    "terms": {
 //       "PORT": "<port>",
@@ -36,7 +37,7 @@ internal class EnterpriseAuthTest {
 
     fun createGSSAPICred() = runBlocking {
         // :snippet-start: auth-creds-gssapi
-        val credential = MongoCredential.createGSSAPICredential("<username>")
+        val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
 
         val settings = MongoClientSettings.builder()
                 .applyToClusterSettings { builder ->
@@ -51,7 +52,7 @@ internal class EnterpriseAuthTest {
 
     fun serviceNameKey() = runBlocking {
         // :snippet-start: service-name-key
-        val credential = MongoCredential.createGSSAPICredential("<username>")
+        val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
             .withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "myService")
         // :snippet-end:
     }
@@ -62,7 +63,7 @@ internal class EnterpriseAuthTest {
         loginContext.login()
         val subject: Subject = loginContext.subject
 
-        val credential = MongoCredential.createGSSAPICredential("<username>")
+        val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
             .withMechanismProperty(MongoCredential.JAVA_SUBJECT_KEY, subject)
         // :snippet-end:
     }
@@ -74,7 +75,7 @@ internal class EnterpriseAuthTest {
         val myLoginContext = "myContext"
         /* Login context defaults to "com.sun.security.jgss.krb5.initiate"
         if unspecified in KerberosSubjectProvider */
-        val credential = MongoCredential.createGSSAPICredential("<username>")
+        val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
             .withMechanismProperty(
                 MongoCredential.JAVA_SUBJECT_PROVIDER_KEY,
                 KerberosSubjectProvider(myLoginContext)
@@ -84,7 +85,7 @@ internal class EnterpriseAuthTest {
 
     fun ldapCredential() = runBlocking {
         // :snippet-start: ldap-mongo-credential
-        val credential = MongoCredential.createPlainCredential("<username>", "$external", "<password>".toCharArray())
+        val credential = MongoCredential.createPlainCredential("<LDAP username>", "$external", "<password>".toCharArray())
 
         val settings = MongoClientSettings.builder()
             .applyToClusterSettings { builder ->
@@ -99,29 +100,29 @@ internal class EnterpriseAuthTest {
 
     fun gssapiConnectionString() = runBlocking {
         // :snippet-start: gssapi-connection-string
-        val connectionString = ConnectionString("<username>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI")
+        val connectionString = ConnectionString("<Kerberos principal>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI")
         val mongoClient = MongoClient.create(connectionString)
         // :snippet-end:
     }
 
     fun gssapiPropertiesConnectionString() = runBlocking {
         // :snippet-start: gssapi-properties-connection-string
-        val connectionString = ConnectionString("<username>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:myService")
+        val connectionString = ConnectionString("<Kerberos principal>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:myService")
         val mongoClient = MongoClient.create(connectionString)
         // :snippet-end:
     }
 
     fun ldapConnectionString() = runBlocking {
         // :snippet-start: ldap-connection-string
-        val connectionString = ConnectionString("<username>:<password>@<hostname>:<port>/?authSource=$external&authMechanism=PLAIN")
+        val connectionString = ConnectionString("<LDAP username>:<password>@<hostname>:<port>/?authSource=$external&authMechanism=PLAIN")
         val mongoClient = MongoClient.create(connectionString)
         // :snippet-end:
     }
 
     fun oidcAzureConnectionString() = runBlocking {
         // :snippet-start: oidc-azure-connection-string
         val connectionString = ConnectionString(
-            "mongodb://<username>@<hostname>:<port>/?" +
+            "mongodb://<OIDC principal>@<hostname>:<port>/?" +
                 "?authMechanism=MONGODB-OIDC" +
                 "&authMechanismProperties=ENVIRONMENT:azure,TOKEN_RESOURCE:<percent-encoded audience>")
         val mongoClient = MongoClient.create(connectionString)
@@ -130,7 +131,7 @@ internal class EnterpriseAuthTest {
 
     fun oidcAzureCredential() = runBlocking {
         // :snippet-start: oidc-azure-credential
-        val credential = MongoCredential.createOidcCredential("<username>")
+        val credential = MongoCredential.createOidcCredential("<OIDC principal>")
             .withMechanismProperty("ENVIRONMENT", "azure")
             .withMechanismProperty("TOKEN_RESOURCE", "<audience>")
 
@@ -147,7 +148,7 @@ internal class EnterpriseAuthTest {
     fun oidcGCPConnectionString() = runBlocking {
         // :snippet-start: oidc-gcp-connection-string
         val connectionString = ConnectionString(
-            "mongodb://<hostname>:<port>/?" +
+            "mongodb://<OIDC principal>@<hostname>:<port>/?" +
                     "authMechanism=MONGODB-OIDC" +
                     "&authMechanismProperties=ENVIRONMENT:gcp,TOKEN_RESOURCE:<percent-encoded audience>")
         val mongoClient = MongoClient.create(connectionString)
@@ -156,7 +157,7 @@ internal class EnterpriseAuthTest {
 
     fun oidcGCPCredential() = runBlocking {
         // :snippet-start: oidc-gcp-credential
-        val credential = MongoCredential.createOidcCredential("<username>")
+        val credential = MongoCredential.createOidcCredential("<OIDC principal>")
             .withMechanismProperty("ENVIRONMENT", "gcp")
             .withMechanismProperty("TOKEN_RESOURCE", "<audience>")
 

diff --git a/examples/src/test/kotlin/MongoClientSettingsTest.kt b/examples/src/test/kotlin/MongoClientSettingsTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.Ignore
 // :replace-start: {
 //    "terms": {
 //       "uri": "\"<your connection string>\"",
-//       "uriString": "\"mongodb+srv:/<username>:<password>@<hostname>:<port>?connectTimeoutMS(2000)\"",
+//       "uriString": "\"mongodb+srv:/<db_username>:<db_password>@<hostname>:<port>?connectTimeoutMS(2000)\"",
 //       "uriAcmeString": "\"mongodb+srv://host1.acme.com\""
 //    }
 // }

diff --git a/source/connection-troubleshooting.txt b/source/connection-troubleshooting.txt
@@ -127,7 +127,7 @@ database:
    :copyable: false
 
    val mongoClient =
-   MongoClient.create("mongodb://<username>:<password>@<hostname>:<port>/?authSource=users")
+   MongoClient.create("mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=users")
 
 .. _kotlin-error-sending-message:
 

diff --git a/source/examples/generated/AuthTest.snippet.default-cred-string.kt b/source/examples/generated/AuthTest.snippet.default-cred-string.kt
@@ -1,2 +1,2 @@
 val mongoClient =
-    MongoClient.create("mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>")
+    MongoClient.create("mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>")
diff --git a/source/examples/generated/AuthTest.snippet.default-mongo-cred.kt b/source/examples/generated/AuthTest.snippet.default-mongo-cred.kt
@@ -1,5 +1,5 @@
 val credential = MongoCredential.createCredential(
-    "<username>", "<authenticationDb>", "<password>".toCharArray()
+    "<db_username>", "<authenticationDb>", "<db_password>".toCharArray()
 )
 val settings = MongoClientSettings.builder()
         .applyToClusterSettings { builder: ClusterSettings.Builder ->

diff --git a/source/examples/generated/AuthTest.snippet.scram-sha-1-cred.kt b/source/examples/generated/AuthTest.snippet.scram-sha-1-cred.kt
@@ -1,5 +1,5 @@
 val credential = MongoCredential.createScramSha1Credential(
-    "<username>", "<authenticationDb>", "<password>".toCharArray()
+    "<db_username>", "<authenticationDb>", "<db_password>".toCharArray()
 )
 val settings = MongoClientSettings.builder()
         .applyToClusterSettings { builder: ClusterSettings.Builder ->

diff --git a/source/examples/generated/AuthTest.snippet.scram-sha-1-string.kt b/source/examples/generated/AuthTest.snippet.scram-sha-1-string.kt
@@ -1,2 +1,2 @@
 val mongoClient =
-    MongoClient.create("mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-1")
+    MongoClient.create("mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-1")
diff --git a/source/examples/generated/AuthTest.snippet.scram-sha-256-cred.kt b/source/examples/generated/AuthTest.snippet.scram-sha-256-cred.kt
@@ -1,5 +1,5 @@
 val credential = MongoCredential.createScramSha256Credential(
-    "<username>", "<authenticationDb>", "<password>".toCharArray()
+    "<db_username>", "<authenticationDb>", "<db_password>".toCharArray()
 )
 val settings = MongoClientSettings.builder()
         .applyToClusterSettings { builder: ClusterSettings.Builder ->

diff --git a/source/examples/generated/AuthTest.snippet.scram-sha-256-string.kt b/source/examples/generated/AuthTest.snippet.scram-sha-256-string.kt
@@ -1,2 +1,2 @@
 val mongoClient =
-    MongoClient.create("mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-256")
+    MongoClient.create("mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=SCRAM-SHA-256")
diff --git a/source/examples/generated/AuthTest.snippet.x-509-string.kt b/source/examples/generated/AuthTest.snippet.x-509-string.kt
@@ -1,2 +1,2 @@
 val mongoClient =
-    MongoClient.create("mongodb://<username>:<password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-X509&tls=true")
+    MongoClient.create("mongodb://<db_username>:<db_password>@<hostname>:<port>/?authSource=<authenticationDb>&authMechanism=MONGODB-X509&tls=true")
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.auth-creds-gssapi.kt b/source/examples/generated/EnterpriseAuthTest.snippet.auth-creds-gssapi.kt
@@ -1,4 +1,4 @@
-val credential = MongoCredential.createGSSAPICredential("<username>")
+val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
 
 val settings = MongoClientSettings.builder()
         .applyToClusterSettings { builder ->

diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.gssapi-connection-string.kt b/source/examples/generated/EnterpriseAuthTest.snippet.gssapi-connection-string.kt
@@ -1,2 +1,2 @@
-val connectionString = ConnectionString("<username>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI")
+val connectionString = ConnectionString("<Kerberos principal>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI")
 val mongoClient = MongoClient.create(connectionString)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.gssapi-properties-connection-string.kt b/source/examples/generated/EnterpriseAuthTest.snippet.gssapi-properties-connection-string.kt
@@ -1,2 +1,2 @@
-val connectionString = ConnectionString("<username>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:myService")
+val connectionString = ConnectionString("<Kerberos principal>@<hostname>:<port>/?authSource=$external&authMechanism=GSSAPI&authMechanismProperties=SERVICE_NAME:myService")
 val mongoClient = MongoClient.create(connectionString)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.java-subject-key.kt b/source/examples/generated/EnterpriseAuthTest.snippet.java-subject-key.kt
@@ -2,5 +2,5 @@ val loginContext = LoginContext("<LoginModule implementation from JAAS config>")
 loginContext.login()
 val subject: Subject = loginContext.subject
 
-val credential = MongoCredential.createGSSAPICredential("<username>")
+val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
     .withMechanismProperty(MongoCredential.JAVA_SUBJECT_KEY, subject)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.kerberos-subject-provider.kt b/source/examples/generated/EnterpriseAuthTest.snippet.kerberos-subject-provider.kt
@@ -3,7 +3,7 @@ will share a Kerberos ticket cache */
 val myLoginContext = "myContext"
 /* Login context defaults to "com.sun.security.jgss.krb5.initiate"
 if unspecified in KerberosSubjectProvider */
-val credential = MongoCredential.createGSSAPICredential("<username>")
+val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
     .withMechanismProperty(
         MongoCredential.JAVA_SUBJECT_PROVIDER_KEY,
         KerberosSubjectProvider(myLoginContext)

diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.ldap-connection-string.kt b/source/examples/generated/EnterpriseAuthTest.snippet.ldap-connection-string.kt
@@ -1,2 +1,2 @@
-val connectionString = ConnectionString("<username>:<password>@<hostname>:<port>/?authSource=$external&authMechanism=PLAIN")
+val connectionString = ConnectionString("<LDAP username>:<password>@<hostname>:<port>/?authSource=$external&authMechanism=PLAIN")
 val mongoClient = MongoClient.create(connectionString)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.ldap-mongo-credential.kt b/source/examples/generated/EnterpriseAuthTest.snippet.ldap-mongo-credential.kt
@@ -1,4 +1,4 @@
-val credential = MongoCredential.createPlainCredential("<username>", "$external", "<password>".toCharArray())
+val credential = MongoCredential.createPlainCredential("<LDAP username>", "$external", "<password>".toCharArray())
 
 val settings = MongoClientSettings.builder()
     .applyToClusterSettings { builder ->

diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.oidc-azure-connection-string.kt b/source/examples/generated/EnterpriseAuthTest.snippet.oidc-azure-connection-string.kt
@@ -1,5 +1,5 @@
 val connectionString = ConnectionString(
-    "mongodb://<username>@<hostname>:<port>/?" +
+    "mongodb://<OIDC principal>@<hostname>:<port>/?" +
         "?authMechanism=MONGODB-OIDC" +
         "&authMechanismProperties=ENVIRONMENT:azure,TOKEN_RESOURCE:<percent-encoded audience>")
 val mongoClient = MongoClient.create(connectionString)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.oidc-azure-credential.kt b/source/examples/generated/EnterpriseAuthTest.snippet.oidc-azure-credential.kt
@@ -1,4 +1,4 @@
-val credential = MongoCredential.createOidcCredential("<username>")
+val credential = MongoCredential.createOidcCredential("<OIDC principal>")
     .withMechanismProperty("ENVIRONMENT", "azure")
     .withMechanismProperty("TOKEN_RESOURCE", "<audience>")
 

diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.oidc-gcp-connection-string.kt b/source/examples/generated/EnterpriseAuthTest.snippet.oidc-gcp-connection-string.kt
@@ -1,5 +1,5 @@
 val connectionString = ConnectionString(
-    "mongodb://<hostname>:<port>/?" +
+    "mongodb://<OIDC principal>@<hostname>:<port>/?" +
             "authMechanism=MONGODB-OIDC" +
             "&authMechanismProperties=ENVIRONMENT:gcp,TOKEN_RESOURCE:<percent-encoded audience>")
 val mongoClient = MongoClient.create(connectionString)
diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.oidc-gcp-credential.kt b/source/examples/generated/EnterpriseAuthTest.snippet.oidc-gcp-credential.kt
@@ -1,4 +1,4 @@
-val credential = MongoCredential.createOidcCredential("<username>")
+val credential = MongoCredential.createOidcCredential("<OIDC principal>")
     .withMechanismProperty("ENVIRONMENT", "gcp")
     .withMechanismProperty("TOKEN_RESOURCE", "<audience>")
 

diff --git a/source/examples/generated/EnterpriseAuthTest.snippet.service-name-key.kt b/source/examples/generated/EnterpriseAuthTest.snippet.service-name-key.kt
@@ -1,2 +1,2 @@
-val credential = MongoCredential.createGSSAPICredential("<username>")
+val credential = MongoCredential.createGSSAPICredential("<Kerberos principal>")
     .withMechanismProperty(MongoCredential.SERVICE_NAME_KEY, "myService")
diff --git a/source/examples/generated/MongoClientSettingsTest.snippet.chain-order-connection-string.kt b/source/examples/generated/MongoClientSettingsTest.snippet.chain-order-connection-string.kt
@@ -1,6 +1,6 @@
 val mongoClient = MongoClient.create(
     MongoClientSettings.builder()
-        .applyConnectionString(ConnectionString("mongodb+srv:/<username>:<password>@<hostname>:<port>?connectTimeoutMS(2000)"))
+        .applyConnectionString(ConnectionString("mongodb+srv:/<db_username>:<db_password>@<hostname>:<port>?connectTimeoutMS(2000)"))
         .applyToSocketSettings{ builder ->
             builder.connectTimeout(5, TimeUnit.SECONDS)
         }

diff --git a/source/fundamentals/auth.txt b/source/fundamentals/auth.txt
@@ -63,8 +63,8 @@ which they advertise support.
 The following code snippets show how to specify the authentication mechanism,
 using the following placeholders:
 
-* ``username`` - your MongoDB username
-* ``password`` - your MongoDB user's password
+* ``db_username`` - your MongoDB database username
+* ``db_password`` - your MongoDB database user's password
 * ``hostname`` - network address of your MongoDB server, accessible by your client
 * ``port`` - port number of your MongoDB server
 * ``authenticationDb`` - MongoDB database that contains your user's
@@ -120,8 +120,8 @@ algorithm, to authenticate your user.
 The following code snippets show how to specify the authentication mechanism,
 using the following placeholders:
 
-* ``username`` - your MongoDB username.
-* ``password`` - your MongoDB user's password.
+* ``db_username`` - your MongoDB database username.
+* ``db_password`` - your MongoDB database user's password.
 * ``hostname`` - network address of your MongoDB server, accessible by your client.
 * ``port`` - port number of your MongoDB server.
 * ``authenticationDb`` - MongoDB database that contains your user's
@@ -172,8 +172,8 @@ your user.
 The following code snippets show how to specify the authentication mechanism,
 using the following placeholders:
 
-* ``username`` - your MongoDB username.
-* ``password`` - your MongoDB user's password.
+* ``db_username`` - your MongoDB database username.
+* ``db_password`` - your MongoDB database user's password.
 * ``hostname`` - network address of your MongoDB server, accessible by your client.
 * ``port`` - port number of your MongoDB server.
 * ``authenticationDb`` - MongoDB database that contains your user's

diff --git a/source/fundamentals/connection/connect.txt b/source/fundamentals/connection/connect.txt
@@ -68,7 +68,7 @@ to change the servers in rotation without reconfiguring clients.
 
 The next part of the connection URI contains your credentials if you are
 using a password-based authentication mechanism. Replace the value of ``user``
-with your username and ``pass`` with your password. If your
+with your database username and ``pass`` with your database user's password. If your
 authentication mechanism does not require credentials, omit this part of
 the connection URI.
 

diff --git a/source/fundamentals/enterprise-auth.txt b/source/fundamentals/enterprise-auth.txt
@@ -66,7 +66,7 @@ principal name.
 The following code snippets show how to specify the authentication mechanism,
 using the following placeholders:
 
-* ``username`` - your URL-encoded principal name, e.g. "username%40REALM.ME"
+* ``Kerberos principal`` - your URL-encoded principal name, e.g. "username%40REALM.ME"
 * ``hostname`` - network address of your MongoDB server, accessible by your client
 * ``port`` - port number of your MongoDB server
 
@@ -248,7 +248,7 @@ parameter to ``PLAIN`` and including your LDAP username and password in the
 The following code snippets show how to specify the authentication mechanism,
 using the following placeholders:
 
-* ``username`` - your LDAP username
+* ``LDAP username`` - your LDAP username
 * ``password`` - your LDAP user's password
 * ``hostname`` - network address of your MongoDB server, accessible by your client
 * ``port`` - port number of your MongoDB server
@@ -344,7 +344,7 @@ see the corresponding syntax.
    .. tab:: MongoCredential
       :tabid: mongodb-azure-mongo-credential
 
-      Replace the ``<username>`` placeholder with the client ID or application ID of the
+      Replace the ``<OIDC principal>`` placeholder with the client ID or application ID of the
       Azure managed identity or enterprise application. Replace the ``<audience>``
       placeholder with the value of the
       ``audience`` server parameter configured on your MongoDB deployment.