Merge branch 'mac-release'

Mac/AppDelegate.swift

@@ -459,7 +459,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?) {

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>

Shared/Resources/GlobalKeyboardShortcuts.plist

@@ -54,7 +54,7 @@
 		<key>key</key>
 		<string>r</string>
 		<key>action</key>
-		<string>markRead:</string>
+		<string>toggleRead:</string>
 	</dict>
 	<dict>
 		<key>title</key>
@@ -94,7 +94,7 @@
 		<key>key</key>
 		<string>u</string>
 		<key>action</key>
-		<string>markUnread:</string>
+		<string>toggleRead:</string>
 	</dict>
 	<dict>
 		<key>title</key>