From 5af831dc4c6d140064ee410746674f237b1b8379 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Thu, 6 Sep 2018 20:16:12 -0700
Subject: [PATCH] Change the URL of the NetNewsWire feed to its new location at
 https://nnw.ranchero.com/feed.json.

---
 Importers/DefaultFeeds.plist                              | 6 +++---
 NetNewsWire/AppDelegate.swift                             | 2 +-
 NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Importers/DefaultFeeds.plist b/Importers/DefaultFeeds.plist
index 40655b136..49e82d0f5 100644
--- a/Importers/DefaultFeeds.plist
+++ b/Importers/DefaultFeeds.plist
@@ -96,11 +96,11 @@
 	</dict>
 	<dict>
 		<key>homePageURL</key>
-		<string>https://ranchero.com/netnewswire/</string>
+		<string>https://nnw.ranchero.com/</string>
 		<key>editedName</key>
-		<string>NetNewsWire News</string>
+		<string>NetNewsWire Blog</string>
 		<key>url</key>
-		<string>https://ranchero.com/netnewswire/feed.json</string>
+		<string>https://nnw.ranchero.com/feed.json</string>
 	</dict>
 	<dict>
 		<key>homePageURL</key>
diff --git a/NetNewsWire/AppDelegate.swift b/NetNewsWire/AppDelegate.swift
index 5ef133f1f..dd3481604 100644
--- a/NetNewsWire/AppDelegate.swift
+++ b/NetNewsWire/AppDelegate.swift
@@ -56,7 +56,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 
 	private let log = Log()
 	private let themeLoader = VSThemeLoader()
-	private let appNewsURLString = "https://ranchero.com/netnewswire/feed.json"
+	private let appNewsURLString = "https://nnw.ranchero.com/feed.json"
 	private let dockBadge = DockBadge()
 
 	override init() {
diff --git a/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift b/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift
index 04730fe60..d2a7a7d70 100644
--- a/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift
+++ b/NetNewsWire/FeedList/FeedListTreeControllerDelegate.swift
@@ -24,7 +24,7 @@ final class FeedListTreeControllerDelegate: TreeControllerDelegate {
 
 	init() {
 
-//		let netnewswireNewsFeed = FeedListFeed(name: "NetNewsWire News", url: "https://ranchero.com/netnewswire/feed.json", homePageURL: "https://ranchero.com/netnewswire/blog/")
+//		let netnewswireNewsFeed = FeedListFeed(name: "NetNewsWire News", url: "https://nnw.ranchero.com/feed.json", homePageURL: "https://nnw.ranchero.com/")
 		self.topLevelFeeds = Set<FeedListFeed>() //Set([netnewswireNewsFeedNewsFeed])
 
 		let defaultFeeds = FeedListReader.defaultFeeds()