diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index 23b5e819c..52b0abd0f 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -608,7 +608,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
@IBAction func openWebsite(_ sender: Any?) {
- Browser.open("https://ranchero.com/netnewswire/", inBackground: false)
+ Browser.open("https://netnewswire.com/", inBackground: false)
}
@IBAction func openReleaseNotes(_ sender: Any?) {
@@ -632,7 +632,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
}
@IBAction func openSlackGroup(_ sender: Any?) {
- Browser.open("https://ranchero.com/netnewswire/slack", inBackground: false)
+ Browser.open("https://netnewswire.com/slack", inBackground: false)
}
@IBAction func openTechnotes(_ sender: Any?) {
@@ -642,7 +642,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
@IBAction func showHelp(_ sender: Any?) {
- Browser.open("https://ranchero.com/netnewswire/help/mac/5.1/en/", inBackground: false)
+ Browser.open("https://netnewswire.com/help/mac/5.1/en/", inBackground: false)
}
@IBAction func donateToAppCampForGirls(_ sender: Any?) {
@@ -650,7 +650,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
}
@IBAction func showPrivacyPolicy(_ sender: Any?) {
- Browser.open("https://ranchero.com/netnewswire/privacypolicy", inBackground: false)
+ Browser.open("https://netnewswire.com/privacypolicy", inBackground: false)
}
@IBAction func gotoToday(_ sender: Any?) {
diff --git a/Mac/CrashReporter/CrashReporter.swift b/Mac/CrashReporter/CrashReporter.swift
index 06aa3f5e6..9c15e602e 100644
--- a/Mac/CrashReporter/CrashReporter.swift
+++ b/Mac/CrashReporter/CrashReporter.swift
@@ -42,7 +42,7 @@ struct CrashReporter {
}
static func sendCrashLogText(_ crashLogText: String) {
- var request = URLRequest(url: URL(string: "https://ranchero.com/netnewswire/crashreportcatcher.php")!)
+ var request = URLRequest(url: URL(string: "https://netnewswire.com/crashreportcatcher.php")!)
request.httpMethod = HTTPMethod.post
let boundary = "0xKhTmLbOuNdArY"
diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist
index e2b17681d..f095490dd 100644
--- a/Mac/Resources/Info.plist
+++ b/Mac/Resources/Info.plist
@@ -72,6 +72,6 @@
SUFeedURL
https://ranchero.com/downloads/netnewswire-release.xml
UserAgent
- NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)
+ NetNewsWire (RSS Reader; https://netnewswire.com/)
diff --git a/Multiplatform/iOS/Info.plist b/Multiplatform/iOS/Info.plist
index cab22bf05..5be8136b3 100644
--- a/Multiplatform/iOS/Info.plist
+++ b/Multiplatform/iOS/Info.plist
@@ -72,7 +72,7 @@
remote-notification
UserAgent
- NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)
+ NetNewsWire (RSS Reader; https://netnewswire.com/)
OrganizationIdentifier
$(ORGANIZATION_IDENTIFIER)
DeveloperEntitlements
diff --git a/Multiplatform/iOS/SafariView.swift b/Multiplatform/iOS/SafariView.swift
index b3a96e718..62f1bc36c 100644
--- a/Multiplatform/iOS/SafariView.swift
+++ b/Multiplatform/iOS/SafariView.swift
@@ -58,6 +58,6 @@ struct SafariView: View {
struct SafariView_Previews: PreviewProvider {
static var previews: some View {
- SafariView(url: URL(string: "https://ranchero.com/netnewswire/")!)
+ SafariView(url: URL(string: "https://netnewswire.com/")!)
}
}
diff --git a/Multiplatform/iOS/Settings/About/About.rtf b/Multiplatform/iOS/Settings/About/About.rtf
index 41b356e05..b8aa6f4e5 100644
--- a/Multiplatform/iOS/Settings/About/About.rtf
+++ b/Multiplatform/iOS/Settings/About/About.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2511
+{\rtf1\ansi\ansicpg1252\cocoartf2513
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red10\green96\blue255;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c0\c47843\c100000\cname systemBlueColor;}
@@ -9,4 +9,4 @@
\fs22 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://ranchero.com/netnewswire/"}}{\fldrslt
-\fs28 \cf3 ranchero.com/netnewswire/}}}
\ No newline at end of file
+\fs28 \cf3 netnewswire.com}}}
\ No newline at end of file
diff --git a/Multiplatform/iOS/Settings/SettingsModel.swift b/Multiplatform/iOS/Settings/SettingsModel.swift
index 63443d3fc..3c8218ae1 100644
--- a/Multiplatform/iOS/Settings/SettingsModel.swift
+++ b/Multiplatform/iOS/Settings/SettingsModel.swift
@@ -17,9 +17,9 @@ class SettingsModel: ObservableObject {
var url: URL? {
switch self {
case .netNewsWireHelp:
- return URL(string: "https://ranchero.com/netnewswire/help/ios/5.0/en/")!
+ return URL(string: "https://netnewswire.com/help/ios/5.0/en/")!
case .netNewsWire:
- return URL(string: "https://ranchero.com/netnewswire/")!
+ return URL(string: "https://netnewswire.com/")!
case .supportNetNewsWire:
return URL(string: "https://github.com/brentsimmons/NetNewsWire/blob/main/Technotes/HowToSupportNetNewsWire.markdown")!
case .github:
@@ -29,7 +29,7 @@ class SettingsModel: ObservableObject {
case .technotes:
return URL(string: "https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes")!
case .netNewsWireSlack:
- return URL(string: "https://ranchero.com/netnewswire/slack")!
+ return URL(string: "https://netnewswire.com/slack")!
case .releaseNotes:
return URL.releaseNotes
case .none:
diff --git a/Multiplatform/macOS/Info.plist b/Multiplatform/macOS/Info.plist
index c0b00660d..58377c4e4 100644
--- a/Multiplatform/macOS/Info.plist
+++ b/Multiplatform/macOS/Info.plist
@@ -30,7 +30,7 @@
UserAgent
- NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)
+ NetNewsWire (RSS Reader; https://netnewswire.com/)
OrganizationIdentifier
$(ORGANIZATION_IDENTIFIER)
DeveloperEntitlements
diff --git a/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift b/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift
index 44e93770b..abcecfaed 100644
--- a/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift
+++ b/Multiplatform/macOS/Preferences/Preference Panes/Advanced/AdvancedPreferencesView.swift
@@ -30,7 +30,7 @@ struct AdvancedPreferencesView: View {
HStack {
Spacer()
Button("Privacy Policy", action: {
- NSWorkspace.shared.open(URL(string: "https://ranchero.com/netnewswire/privacypolicy")!)
+ NSWorkspace.shared.open(URL(string: "https://netnewswire.com/privacypolicy")!)
})
Spacer()
}
diff --git a/README.md b/README.md
index 2dbb595f9..e60220cbb 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ It’s a free and open source feed reader for macOS and iOS.
It supports [RSS](http://cyber.harvard.edu/rss/rss.html), [Atom](https://tools.ietf.org/html/rfc4287), [JSON Feed](https://jsonfeed.org/), and [RSS-in-JSON](https://github.com/scripting/Scripting-News/blob/master/rss-in-json/README.md) formats.
-More info: [https://ranchero.com/netnewswire/](https://ranchero.com/netnewswire/)
+More info: [https://netnewswire.com/](https://netnewswire.com/)
Also see the [Technotes](Technotes/) and the [Roadmap](Technotes/Roadmap.md).
@@ -14,7 +14,7 @@ Here’s [How to Support NetNewsWire](Technotes/HowToSupportNetNewsWire.markdown
#### Community
-[Join the Slack group](https://ranchero.com/netnewswire/slack) to talk with other NetNewsWire users — and to help out, if you’d like to, by testing, coding, writing, providing feedback, or just helping us think things through. Everybody is welcome and encouraged to join.
+[Join the Slack group](https://netnewswire.com/slack) to talk with other NetNewsWire users — and to help out, if you’d like to, by testing, coding, writing, providing feedback, or just helping us think things through. Everybody is welcome and encouraged to join.
Every community member is expected to abide by the code of conduct which is included in the [Contributing](CONTRIBUTING.md) page.
diff --git a/Shared/ArticleStyles/ArticleStyle.swift b/Shared/ArticleStyles/ArticleStyle.swift
index 01f5d86fb..97b9a3030 100644
--- a/Shared/ArticleStyles/ArticleStyle.swift
+++ b/Shared/ArticleStyles/ArticleStyle.swift
@@ -24,7 +24,7 @@ struct ArticleStyle: Equatable {
self.path = nil;
self.emptyCSS = nil
- self.info = ["CreatorHomePage": "https://ranchero.com/", "CreatorName": "Ranchero Software, LLC", "Version": "1.0"]
+ self.info = ["CreatorHomePage": "https://netnewswire.com/", "CreatorName": "Ranchero Software", "Version": "1.0"]
let sharedCSSPath = Bundle.main.path(forResource: "shared", ofType: "css")!
let platformCSSPath = Bundle.main.path(forResource: "styleSheet", ofType: "css")!
diff --git a/iOS/Resources/About.rtf b/iOS/Resources/About.rtf
index 41b356e05..8bf10c2d4 100644
--- a/iOS/Resources/About.rtf
+++ b/iOS/Resources/About.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2511
+{\rtf1\ansi\ansicpg1252\cocoartf2513
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue0;\red10\green96\blue255;}
{\*\expandedcolortbl;;\cssrgb\c0\c0\c0;\cssrgb\c0\c47843\c100000\cname systemBlueColor;}
@@ -8,5 +8,5 @@
\f0\b\fs28 \cf2 By Brent Simmons and the Ranchero Software team
\fs22 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
-{\field{\*\fldinst{HYPERLINK "https://ranchero.com/netnewswire/"}}{\fldrslt
-\fs28 \cf3 ranchero.com/netnewswire/}}}
\ No newline at end of file
+{\field{\*\fldinst{HYPERLINK "https://netnewswire.com/"}}{\fldrslt
+\fs28 \cf3 netnewswire.com}}}
\ No newline at end of file
diff --git a/iOS/Resources/Info.plist b/iOS/Resources/Info.plist
index e843a3e9e..24e877697 100644
--- a/iOS/Resources/Info.plist
+++ b/iOS/Resources/Info.plist
@@ -176,6 +176,6 @@
UserAgent
- NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/)
+ NetNewsWire (RSS Reader; https://netnewswire.com/)
diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift
index ae4497bb0..62ad0dda3 100644
--- a/iOS/Settings/SettingsViewController.swift
+++ b/iOS/Settings/SettingsViewController.swift
@@ -226,10 +226,10 @@ class SettingsViewController: UITableViewController {
case 7:
switch indexPath.row {
case 0:
- openURL("https://ranchero.com/netnewswire/help/ios/5.0/en/")
+ openURL("https://netnewswire.com/help/ios/5.0/en/")
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
case 1:
- openURL("https://ranchero.com/netnewswire/")
+ openURL("https://netnewswire.com/")
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
case 2:
openURL(URL.releaseNotes.absoluteString)
@@ -247,7 +247,7 @@ class SettingsViewController: UITableViewController {
openURL("https://github.com/brentsimmons/NetNewsWire/tree/main/Technotes")
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
case 7:
- openURL("https://ranchero.com/netnewswire/slack")
+ openURL("https://netnewswire.com/slack")
tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
case 8:
let timeline = UIStoryboard.settings.instantiateController(ofType: AboutViewController.self)