From 9385d12212f81dc63b7c386cb7d523158bde5149 Mon Sep 17 00:00:00 2001
From: Johannes Passing <jpassing@hotmail.com>
Date: Tue, 7 Jan 2025 10:15:12 +1100
Subject: [PATCH 1/2] b/388039767 Clarify semantics of Automatic Logon setting

---
 .../docs/toolwindow-connection-settings.md    | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/doc/site/sources/docs/toolwindow-connection-settings.md b/doc/site/sources/docs/toolwindow-connection-settings.md
index 1f74fd646..110510489 100644
--- a/doc/site/sources/docs/toolwindow-connection-settings.md
+++ b/doc/site/sources/docs/toolwindow-connection-settings.md
@@ -214,14 +214,27 @@ These settings control which RDP security mechanism to apply.
     <tr>
         <td>Automatic logon</td>
         <td>
-            Controls whether IAP Desktop attempts to log you on automatically by using <a href="#windows-credentials">saved credentials</a>
-            or by offering to generate new Windows credentials.
-            <br><br>
-            Set this to <b>Disabled</b> for VMs that use the <a href="https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.TerminalServer::TS_PASSWORD">Always prompt for password upon connection</a>
-            group policy setting to <a href="/iap-desktop/troubleshooting-rdp/#your-credentials-did-not-work-when-using-saved-credentials">
-            prevent duplicate password prompts</a>.
+            Controls how IAP Desktop behaves if you haven't configured any <a href="#windows-credentials">Windows credentials</a>.
+
+            <ul>
+            <li>
+                When set to <b>Enabled</b>, IAP Desktop proactively shows a credential prompt that offers a <i>Remember me</i> option
+                so that it can log you in automatically the next time.
+            </li>
+            <li>
+                When set to <b>Disabled</b>, IAP Desktop won't offer a <i>Remember me</i> option, and won't try
+                to log you in automatically unless you manually configure <a href="#windows-credentials">Windows credentials</a>.
+                <br><br>
+                Set this to <b>Disabled</b> for VMs that use the <a href="https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.TerminalServer::TS_PASSWORD">Always prompt for password upon connection</a>
+                group policy setting to <a href="/iap-desktop/troubleshooting-rdp/#your-credentials-did-not-work-when-using-saved-credentials">
+                prevent duplicate password prompts</a>.
+            </li>
+            </ul>
+            The setting is automatically set to <b>Disabled</b> if your local computer is subject to the 
+            <a href="https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.TerminalServer::TS_CLIENT_DISABLE_PASSWORD_SAVING_2">
+            Do not allow passwords to be saved</a> group policy. 
         </td>
-        <td>Enabled</td>
+        <td>See description</td>
     </tr>
     <tr>
         <td>Network level authentication</td>

From aedf12ef6475ec3c7dc344f28043564426d0a458 Mon Sep 17 00:00:00 2001
From: Johannes Passing <jpassing@hotmail.com>
Date: Tue, 7 Jan 2025 10:16:24 +1100
Subject: [PATCH 2/2] Update copyright

---
 doc/site/sources/mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/site/sources/mkdocs.yml b/doc/site/sources/mkdocs.yml
index 9ab0e707c..c7e22e802 100644
--- a/doc/site/sources/mkdocs.yml
+++ b/doc/site/sources/mkdocs.yml
@@ -65,7 +65,7 @@ download_url: https://github.com/GoogleCloudPlatform/iap-desktop/releases/latest
 copyright: |
     IAP Desktop is an open-source project developed and maintained by the Google Cloud Solutions Architects team.<br>
     The project is not an officially supported Google product.<br>
-    Copyright &copy; 2019-2024 Google LLC<br>
+    Copyright &copy; 2019-2025 Google LLC<br>
     <a href='https://cloud.google.com/'><img src='https://googlecloudplatform.github.io/iap-desktop/images/cloud.svg' width='240' height='160'/></a>
 
 markdown_extensions: