Merge from trunk.

[bpt/emacs.git] / doc / misc / newsticker.texi

diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index fadcf1e..919ca21 100644 (file)
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -13,8 +13,7 @@
 This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
 
 @noindent
-Copyright @copyright{} 2004-2011
-Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -30,7 +29,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
 * Newsticker: (newsticker).     A Newsticker for Emacs.
 @end direntry
@@ -52,7 +51,7 @@ developing GNU and promoting software freedom.''
 @node Top
 @top Newsticker
 
-@insertcopying 
+@insertcopying
 
 @end ifnottex
 
@@ -112,9 +111,9 @@ enclosed files (as delivered by podcasts, e.g.).
 Here are screen shots of the @uref{newsticker-1.7.png, version 1.7
 (current version)} and some older screen shots:
 @uref{newsticker-1.6.png, version 1.6},
-@uref{newsticker-1.5.png, version 1.5}, 
+@uref{newsticker-1.5.png, version 1.5},
 @uref{newsticker-1.4.png, version 1.4}
-@uref{newsticker-1.3.png, version 1.3}, 
+@uref{newsticker-1.3.png, version 1.3},
 @uref{newsticker-1.0.png, version 1.0}.
 @end ifhtml
 
@@ -128,7 +127,7 @@ requires an XML-parser (@file{xml.el}) which is part of GNU Emacs.  If
 you are using XEmacs you want to get the @file{net-utils} package
 which contains @file{xml.el} for XEmacs.
 
-Newsticker retrieves headlines either via Emacs' built-in retrieval
+Newsticker retrieves headlines either via Emacs's built-in retrieval
 functions, by an arbitrary external program that retrieves files via
 http and prints them to stdout (like
 @uref{http://www.gnu.org/software/wget/wget.html, wget}, or -- on a
@@ -163,7 +162,7 @@ You can choose between two different frontends for reading headlines:
 @item Newsticker's @emph{treeview} uses separate windows for the
 feeds (in tree form), a list of headlines for the current feed, and
 the content of the current headline. Feeds can be placed into groups
-which itself can be placed in groups and so on. 
+which itself can be placed in groups and so on.
 @item Newsticker's @emph{plainview} displays all headlines in a
 single buffer, called @samp{*newsticker*}. The modeline in the
 @samp{*newsticker*} buffer informs whenever new headlines have
@@ -171,7 +170,7 @@ arrived.
 @end itemize
 In both views clicking mouse-button 2 or pressing RET on a headline
 will call @code{browse-url} to load the corresponding news story in
-your favourite web browser.
+your favorite web browser.
 
 @findex newsticker-start-ticker
 @findex newsticker-stop-ticker
@@ -205,7 +204,7 @@ and some of the most important options.
 
 @item
 @code{newsticker-retrieval} contains options that define which news
-feeds are retrieved and how this is done.  
+feeds are retrieved and how this is done.
 
 @itemize
 @item
@@ -215,7 +214,7 @@ retrieved.
 @item
 @vindex newsticker-retrieval-method
 @code{newsticker-retrieval-method} defines how headlines are
-retrieved. This is either done using Emacs' built-in download
+retrieved.  This is either done using Emacs's built-in download
 capabilities or using an external tool.
 @item
 @vindex newsticker-retrieval-interval
@@ -241,7 +240,7 @@ automatically mark headlines as immortal or old.
 
 @item
 @code{newsticker-hooks} contains options for hooking other Emacs
-commands to newsticker functions. 
+commands to newsticker functions.
 @itemize
 @item
 @vindex newsticker-new-item-functions
@@ -313,5 +312,3 @@ Byte-compiling newsticker.el is recommended.
 @printindex cp
 
 @bye
-
-