From 5f2e86104c30a536b399838235d5048472db238a Mon Sep 17 00:00:00 2001
From: Dmitry Gordin <gordin.mitya@gmail.com>
Date: Mon, 30 Dec 2024 13:15:46 +0500
Subject: [PATCH 1/3] Update apple.md for latest version of iOS

The official iOS app now has a simpler login process for custom instances, directly within the app.
---
 docs/usage/connect/apple.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/usage/connect/apple.md b/docs/usage/connect/apple.md
index 910d99614a..8ed46f59bf 100644
--- a/docs/usage/connect/apple.md
+++ b/docs/usage/connect/apple.md
@@ -15,7 +15,14 @@ Install the official Tailscale iOS client from the [App Store](https://apps.appl
 
 ### Configuring the headscale URL
 
-- Open Tailscale and make sure you are _not_ logged in to any account
+- Open the Tailscale app
+- Click the account icon in the top-right corner and select “Log in…”.
+- Tap the top-right options menu button and select “Use custom coordination server”.
+- Enter your instance url
+
+<details>
+  <summary>Older app versions</summary>
+
 - Open Settings on the iOS device
 - Scroll down to the `third party apps` section, under `Game Center` or `TV Provider`
 - Find Tailscale and select it
@@ -25,6 +32,8 @@ Install the official Tailscale iOS client from the [App Store](https://apps.appl
   _(non-SSO)_. It should open up to the headscale authentication page.
 - Enter your credentials and log in. Headscale should now be working on your iOS device.
 
+</details>
+
 ## macOS
 
 ### Installation

From fe839b7d85c7b8e0e48208b4b36ceccb661aae62 Mon Sep 17 00:00:00 2001
From: Dmitry Gordin <gordin.mitya@gmail.com>
Date: Mon, 30 Dec 2024 13:44:21 +0500
Subject: [PATCH 2/3] Update apple.go

---
 hscontrol/templates/apple.go | 41 ++++++------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/hscontrol/templates/apple.go b/hscontrol/templates/apple.go
index 827b5f0fe5..5cc7ff4be1 100644
--- a/hscontrol/templates/apple.go
+++ b/hscontrol/templates/apple.go
@@ -27,49 +27,22 @@ func Apple(url string) *elem.Element {
 						elem.Text("App store"),
 					),
 				),
-				elem.Li(nil,
-					elem.Text("Open Tailscale and make sure you are "),
-					elem.I(nil, elem.Text("not ")),
-					elem.Text("logged in to any account"),
-				),
-				elem.Li(nil,
-					elem.Text("Open Settings on the iOS device"),
-				),
 				elem.Li(
 					nil,
-					elem.Text(
-						`Scroll down to the "third party apps" section, under "Game Center" or "TV Provider"`,
-					),
+					elem.Text("Open the Tailscale app"),
 				),
-				elem.Li(nil,
-					elem.Text("Find Tailscale and select it"),
-					elem.Ul(nil,
-						elem.Li(
-							nil,
-							elem.Text(
-								`If the iOS device was previously logged into Tailscale, switch the "Reset Keychain" toggle to "on"`,
-							),
-						),
-					),
+				elem.Li(
+					nil,
+					elem.Text("Click the account icon in the top-right corner and select 'Log in…'."),
 				),
 				elem.Li(
 					nil,
-					elem.Text(
-						fmt.Sprintf(
-							`Enter "%s" under "Alternate Coordination Server URL"`,
-							url,
-						),
-					),
+					elem.Text("Tap the top-right options menu button and select 'Use custom coordination server'."),
 				),
 				elem.Li(
 					nil,
-					elem.Text(
-						"Restart the app by closing it from the iOS app switcher, open the app and select the regular sign in option ",
-					),
-					elem.I(nil, elem.Text("(non-SSO)")),
-					elem.Text(
-						". It should open up to the headscale authentication page.",
-					),
+					elem.Text("Enter your instance URL: "),
+					elem.Text(url),
 				),
 				elem.Li(
 					nil,

From c792650c8b37aebcf6b2d819ef94b1a7611d77e7 Mon Sep 17 00:00:00 2001
From: Dmitry Gordin <gordin.mitya@gmail.com>
Date: Mon, 30 Dec 2024 13:45:37 +0500
Subject: [PATCH 3/3] Update apple.md

---
 docs/usage/connect/apple.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/docs/usage/connect/apple.md b/docs/usage/connect/apple.md
index 8ed46f59bf..62f32ea6fe 100644
--- a/docs/usage/connect/apple.md
+++ b/docs/usage/connect/apple.md
@@ -19,21 +19,8 @@ Install the official Tailscale iOS client from the [App Store](https://apps.appl
 - Click the account icon in the top-right corner and select “Log in…”.
 - Tap the top-right options menu button and select “Use custom coordination server”.
 - Enter your instance url
-
-<details>
-  <summary>Older app versions</summary>
-
-- Open Settings on the iOS device
-- Scroll down to the `third party apps` section, under `Game Center` or `TV Provider`
-- Find Tailscale and select it
-  - If the iOS device was previously logged into Tailscale, switch the `Reset Keychain` toggle to `on`
-- Enter the URL of your headscale instance (e.g `https://headscale.example.com`) under `Alternate Coordination Server URL`
-- Restart the app by closing it from the iOS app switcher, open the app and select the regular sign in option
-  _(non-SSO)_. It should open up to the headscale authentication page.
 - Enter your credentials and log in. Headscale should now be working on your iOS device.
 
-</details>
-
 ## macOS
 
 ### Installation