From c8b0adb382e411c4ba70f3d5c3f8955655b54d53 Mon Sep 17 00:00:00 2001
From: Adrian Dewhurst <adrian@tailscale.com>
Date: Wed, 17 Apr 2024 10:57:37 -0400
Subject: [PATCH] docs/windows/policy: add missing key expiration warning
 interval

Fixes #11345

Change-Id: Ib53b639690b77d1b7d857304dca2119f197227ce
Signed-off-by: Adrian Dewhurst <adrian@tailscale.com>
---
 docs/windows/policy/en-US/tailscale.adml | 20 ++++++++++++--------
 docs/windows/policy/tailscale.admx       |  7 +++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/docs/windows/policy/en-US/tailscale.adml b/docs/windows/policy/en-US/tailscale.adml
index e928fade0..dc7b50f19 100644
--- a/docs/windows/policy/en-US/tailscale.adml
+++ b/docs/windows/policy/en-US/tailscale.adml
@@ -164,12 +164,10 @@ This does not affect using the CLI to select or stop using an exit node. If you
 If you enable or don't configure this policy, the Exit Node submenu will be shown in the Tailscale menu.
 
 If you disable this policy, the Exit Node submenu will be hidden from the Tailscale menu.]]></string>
-            <string id="KeyExpirationNoticeTime">Specify a custom key expiration notification time</string>
-            <string id="KeyExpirationNoticeTime_Help"><![CDATA[This policy can be used to configure how soon the notification appears before key expiry.
+            <string id="KeyExpirationNotice">Specify a custom key expiration notification time</string>
+            <string id="KeyExpirationNotice_Help"><![CDATA[This policy can be used to configure how soon the notification appears before key expiry.
 See https://tailscale.com/kb/1315/mdm-keys#set-the-key-expiration-notice-period for more details.
 
-Time intervals must be specified as a Go Duration: for example, 24h, 5h25m30s. Time units larger than hours are unsupported.
-
 If you enable this policy and supply a valid time interval, the key expiry notification will begin to display when the current key has less than that amount of time remaining.
 
 If you disable or don't configure this policy, the default time period will be used (as of Tailscale 1.56, this is 24 hours).]]></string>
@@ -208,22 +206,22 @@ See https://tailscale.com/kb/1315/mdm-keys#set-your-organization-name for more d
         <presentationTable>
             <presentation id="LoginURL">
                 <textBox refId="LoginURLPrompt">
-                    <label>Coordination server</label>
+                    <label>Coordination server:</label>
                 </textBox>
             </presentation>
             <presentation id="LogTarget">
                 <textBox refId="LogTargetPrompt">
-                    <label>Log server</label>
+                    <label>Log server:</label>
                 </textBox>
             </presentation>
             <presentation id="Tailnet">
                 <textBox refId="TailnetPrompt">
-                    <label>Tailnet</label>
+                    <label>Tailnet:</label>
                 </textBox>
             </presentation>
             <presentation id="ExitNodeID">
                 <textBox refId="ExitNodeIDPrompt">
-                    <label>Exit Node</label>
+                    <label>Exit Node:</label>
                 </textBox>
             </presentation>
             <presentation id="ManagedBy">
@@ -237,6 +235,12 @@ See https://tailscale.com/kb/1315/mdm-keys#set-your-organization-name for more d
                     <label>Support URL:</label>
                 </textBox>
             </presentation>
+            <presentation id="KeyExpirationNotice">
+                <textBox refId="KeyExpirationNoticePrompt">
+                    <label>Key expiration notice period:</label>
+                </textBox>
+                <text>Time intervals must be specified as a Go Duration: for example, 24h, 5h25m30s. Time units larger than hours are unsupported.</text>
+            </presentation>
         </presentationTable>
     </resources>
 </policyDefinitionResources>
diff --git a/docs/windows/policy/tailscale.admx b/docs/windows/policy/tailscale.admx
index c40e94f7d..cb7f1cf80 100644
--- a/docs/windows/policy/tailscale.admx
+++ b/docs/windows/policy/tailscale.admx
@@ -265,5 +265,12 @@
         <text id="ManagedBySupportURL" valueName="ManagedByURL" />
       </elements>
     </policy>
+    <policy name="KeyExpirationNotice" class="Machine" displayName="$(string.KeyExpirationNotice)" explainText="$(string.KeyExpirationNotice_Help)" presentation="$(presentation.KeyExpirationNotice)" key="Software\Policies\Tailscale">
+      <parentCategory ref="UI_Category" />
+      <supportedOn ref="SINCE_V1_50" />
+      <elements>
+        <text id="KeyExpirationNoticePrompt" valueName="KeyExpirationNotice" required="true" />
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>