Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire

Frameworks/ArticlesDatabase/ArticlesDatabase.swift

@@ -170,7 +170,7 @@ private extension ArticlesDatabase {
 	"""
 
 	func todayCutoffDate() -> Date {
-		// 28 hours previous. This is used by the Today smart feed, which should not actually empty out at midnight.
-		return Date(timeIntervalSinceNow: -(60 * 60 * 28)) // This does not need to be more precise.
+		// 24 hours previous. This is used by the Today smart feed, which should not actually empty out at midnight.
+		return Date(timeIntervalSinceNow: -(60 * 60 * 24)) // This does not need to be more precise.
 	}
 }

Technotes/HelpBook/5.0/en/adding-feeds.markdown

@@ -0,0 +1,47 @@
+@title How to add a feed to NetNewsWire
+
+# How to add a feed to NetNewsWire
+
+NetNewsWire collects items for you from feeds published on web sites. To do this, NetNewsWire needs to know the address for the feed, e.g. `https://inessential.com/feed.xml`.
+
+*It’s okay if you don’t know that.* NetNewsWire will look at any web page and try to find it for you. All you need to give is the site’s URL, like `inessential.com`.
+
+To get started, click the Add Feed button on the toolbar, or use File → New Feed (⌘-N) from the menu bar.
+
+If you’ve got the address already – great! Type it or paste it into the URL box. Otherwise, just enter the website’s address into the box. 
+
+Before you finish, you can choose an alternative name for the feed and where it will be stored (see below).
+
+Click ‘Add’ and NetNewsWire will fetch the URL you entered. If you entered an address that’s not a feed, NetNewsWire will search the page and add the feed it finds.
+
+
+## Choosing an alternative name for a feed
+
+Feeds specify their own name, but you may want to change it to something easier to remember. ‘Brent’ rather than ‘inessential’, for example. You also change this later in the [feed inspector].
+
+
+## Choosing a feed’s folder
+
+Before you add a feed, you can choose the account and folder where it will be saved. 
+
+This option is especially important if you’re using multiple accounts. You can choose whether to save the subscription to your [On My Mac](on-my-mac.html) account or [Feedbin] account.
+
+In either case, if you use folders, you can also choose which one keep the feed in.
+
+
+## What to do when NetNewsWire can’t find a feed
+
+Sometimes NetNewsWire won’t be able to find a feed for a site.  Either the site doesn’t offer a feed, or the feed isn’t advertised in a way that NetNewsWire can find it.
+
+You may be able to find a feed manually by visiting the site. There, look for a link to an RSS, Atom or JSON feed. If one exists, you can add this direct URL to NetNewsWire using the process above. Right-click on the link and copy the URL to paste into NetNewsWire.
+
+
+## Other ways to add feeds
+
+### Safari Extension
+
+You can also add a feed from Safari using the [NetNewsWire Safari Extension](safari-extension.html).
+
+### Importing an OPML list of feeds
+
+If you have an existing subscription list in OPML format, you can [import those feeds into NetNewsWire](import-opml.html).

Technotes/HelpBook/5.0/en/export-opml.markdown

@@ -0,0 +1,14 @@
+@title How to export OPML
+
+# How to export OPML
+
+Your subscription list is portable, meaning you can easily switch to another app or service at any time. NetNewsWire can export an OPML file containing all your subscriptions. This file format is well-established and widely supported for just this purpose.
+
+1. From the menu bar, select **File → Export Subscriptions…**
+2. If you have multiple accounts, select which account’s subscriptions to export
+3. Choose the name and location for the OPML file
+4. Click **Export OPML**
+
+Your subscriptions in NetNewsWire are unaffected by this action. Nothing is changed or removed.
+
+You can now use this file for any app or service which allows you to import OPML-formatted subscription lists.

Technotes/HelpBook/5.0/en/import-opml.markdown

@@ -0,0 +1,16 @@
+@title How to import OPML
+
+# How to import OPML
+
+You can use an OPML subscription list to import your subscriptions from another app or service into NetNewsWire.
+
+First you need to get an OPML file. This should be pretty easy – look for export options in the app or the service’s web site.
+
+Once you’ve got the OPML file, NetNewsWire can make quick work of importing the items within.
+
+1. From the menu bar, select **File → Import Subscriptions…**
+2. If you have multiple accounts, select which account to receive the new subscriptions
+3. Navigate to the OPML file’s location
+4. Select it and click **Open**
+
+NetNewsWire won’t replace your current subscription list. The new subscriptions will be added in addition to your current ones.

Technotes/HelpBook/5.0/en/index.markdown

@@ -5,11 +5,11 @@
 
 More topics to do…
 
-How to add a feed
+[How to add a feed](adding-feeds.html)
 
-Installing and using the Safari Extension to add feeds
+[Installing and using the Safari Extension to add feeds](safari-extension.html)
 
-How to import OPML
+[How to import OPML](import-opml.html)
 
 How to export OPML
 
@@ -27,7 +27,7 @@ How to get NetNewsWire news (see Help menu command)
 
 Keyboard shortcuts (see Help menu command)
 
-About the On My Mac account
+[About the On My Mac account](on-my-mac.html)
 
 Privacy (including link to privacy policy)
 

Technotes/HelpBook/5.0/en/on-my-mac.markdown

@@ -0,0 +1,14 @@
+@title About the On My Mac account
+
+# About the On My Mac account
+
+The On My Mac account is the simplest way to use NetNewsWire. Using it requires no additional service or software. It’s just you, your subscriptions and NetNewsWire.
+
+On My Mac subscriptions are wholly managed by NetNewsWire. It keeps your subscription list and is responsible for fetching the feeds and checking for updates. This means it also keeps track of what items you’ve read or not.
+
+The On My Mac account does not sync this data to any other location. It works best for those people who only read NetNewsWire feeds on one Mac and nowhere else.
+
+
+## Refreshing On My Mac feeds
+
+The feeds in the On My Mac account will be refreshed automatically whenever you open NetNewsWire. If left open, NetNewsWire will refresh your feeds every hour, or according to the schedule you set in Preferences. You can also disable all automatic refreshing from there.

Technotes/HelpBook/5.0/en/safari-extension.markdown

@@ -0,0 +1,32 @@
+@title Installing and using the Safari Extension to add feeds
+
+# Installing and using the Safari Extension to add feeds
+
+NetNewsWire provides a Safari Extension which adds a ‘Subscribe to Feed’ button to your Safari toolbar. This allows you to quickly add a site’s feed without entering an address manually into NetNewsWire.
+
+
+## Installing the NetNewsWire Safari Extension
+
+The Safari Extension is installed automatically with NetNewsWire. However, it must be *enabled* before you can use it.
+
+You will enable the extension in Safari:
+
+1. Open Safari
+2. Click on the **Safari** menu and select **Preferences…** (⌘,)
+3. Click the **Extensions** panel
+4. From the list, click the checkbox beside **Subscribe to Feed** to enable the extension
+5. Close the Preferences window
+
+Once this is done, the ‘Subscribe to Feed’ button will be added to your Safari toolbar.
+
+
+## Adding a feed using the Safari Extension
+
+For any site that advertises its feeds, you can use the ‘Subscribe to Feed’ button. Clicking it send the feed’s address to NetNewsWire where you can set options like an alternative feed name, and the account and folder where it will be stored.
+
+
+### What to do if the ‘Subscribe to Feed’ button is greyed out and disabled
+
+The ‘Subscribe in NetNewsWire’ button will only be enabled for sites that advertise their feeds in their code. If the button is disabled, NetNewsWire wasn’t able to find any feeds automatically.
+
+You may be able to find a feed manually by visiting the site. There, look for a link to an RSS, Atom or JSON feed. If one exists, you can [add this URL to NetNewsWire directly](adding-feeds.html). Right-click on the link and copy the URL to paste into NetNewsWire.