From 27478b0f6f4c18caec206b7f53051a926145f7c2 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 29 Sep 2019 22:44:32 -0700
Subject: [PATCH 1/2] Make r and u both just toggle read status. Update
 keyboard shortcuts HTML documentation to match.

---
 Mac/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist  | 4 ++--
 Mac/Resources/KeyboardShortcuts/KeyboardShortcuts.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mac/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist b/Mac/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
index 6218cd47e..32695e230 100644
--- a/Mac/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
+++ b/Mac/MainWindow/Keyboard/GlobalKeyboardShortcuts.plist
@@ -46,7 +46,7 @@
 		<key>key</key>
 		<string>r</string>
 		<key>action</key>
-		<string>markRead:</string>
+		<string>toggleRead:</string>
 	</dict>
 	<dict>
 		<key>key</key>
@@ -76,7 +76,7 @@
 		<key>key</key>
 		<string>u</string>
 		<key>action</key>
-		<string>markUnread:</string>
+		<string>toggleRead:</string>
 	</dict>
 	<dict>
 		<key>key</key>
diff --git a/Mac/Resources/KeyboardShortcuts/KeyboardShortcuts.html b/Mac/Resources/KeyboardShortcuts/KeyboardShortcuts.html
index 92c64a5ee..d44dd4880 100644
--- a/Mac/Resources/KeyboardShortcuts/KeyboardShortcuts.html
+++ b/Mac/Resources/KeyboardShortcuts/KeyboardShortcuts.html
@@ -51,12 +51,12 @@
 
     <tr><td>Scroll or go to next unread</td><td><kbd>space</kbd></td></tr>
     <tr><td>Go to next unread</td><td><kbd>n or +</kbd></td></tr>
-    <tr><td>Mark as read</td><td><kbd>r</kbd></td></tr>
+    <tr><td>Toggle read status</td><td><kbd>r or u</kbd></td></tr>
     <tr><td>Mark all as read</td><td><kbd>k</kbd></td></tr>
     <tr><td>Mark older articles as read</td><td><kbd>o</kbd></td></tr>
     <tr><td>Mark all as read, go to next unread</td><td><kbd>l</kbd></td></tr>
     <tr><td>Mark as unread, go to next unread</td><td><kbd>m</kbd></td></tr>
-    <tr><td>Mark as unread</td><td><kbd>u</kbd></td></tr>
+    <tr><td>Toggle starred status</td><td><kbd>s</kbd></td></tr>
     <tr><td>Open in browser</td><td><kbd>b</kbd> or <kbd>&#9166;</kbd> or <kbd>Enter</kbd></td></tr>
     <tr><td>Previous subscription</td><td><kbd>a</kbd></td></tr>
     <tr><td>Next subscription</td><td><kbd>z</kbd></td></tr>

From 098128fd0af60864bbff1e8f4bfb34390c5b644f Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 29 Sep 2019 22:46:40 -0700
Subject: [PATCH 2/2] Use new Slack group URL with Help menu command. Fix
 #1087.

---
 Mac/AppDelegate.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index eb122e939..581126f56 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -454,7 +454,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 	}
 
 	@IBAction func openSlackGroup(_ sender: Any?) {
-		Browser.open("https://join.slack.com/t/netnewswire/shared_invite/enQtNjM4MDA1MjQzMDkzLTNlNjBhOWVhYzdhYjA4ZWFhMzQ1MTUxYjU0NTE5ZGY0YzYwZWJhNjYwNTNmNTg2NjIwYWY4YzhlYzk5NmU3ZTc", inBackground: false)
+		Browser.open("https://ranchero.com/netnewswire/slack", inBackground: false)
 	}
 
 	@IBAction func openTechnotes(_ sender: Any?) {