[Emacs-diffs] /srv/bzr/emacs/trunk r99726: Synch with Gnus trunk

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 99726 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-23 07:32:05 +0000
message:
  Synch with Gnus trunk
  =====================
  2010-03-22  Teodor Zlatanov  <address@hidden>
  
   * gnus/gnus-setup.ast: Add finish links to the top nodes.
  
   * gnus/news-server.ast: Add some trivial validation.
modified:
  etc/ChangeLog
  etc/gnus/gnus-setup.ast
  etc/gnus/news-server.ast

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2010-03-13 20:33:54 +0000
+++ b/etc/ChangeLog     2010-03-23 07:29:49 +0000
@@ -1,3 +1,9 @@
+2010-03-22  Teodor Zlatanov  <address@hidden>
+
+       * gnus/gnus-setup.ast: Add finish links to the top nodes.
+
+       * gnus/news-server.ast: Add some trivial validation.
+
 2010-03-13  Michael Albinus  <address@hidden>
 
        * NEWS: Add secrets.el.

=== modified file 'etc/gnus/gnus-setup.ast'
--- a/etc/gnus/gnus-setup.ast   2007-10-28 09:18:39 +0000
+++ b/etc/gnus/gnus-setup.ast   2010-03-23 07:29:49 +0000
@@ -33,6 +33,8 @@
 
 @end text
 
address@hidden 'finish
+
 @node Setting up a NNTP server
 
 @text
@@ -40,6 +42,8 @@
 Run M-x assistant and use the news-server.ast file as input.
 @end text
 
address@hidden 'finish
+
 
 @c Local variables:
 @c mode: texinfo

=== modified file 'etc/gnus/news-server.ast'
--- a/etc/gnus/news-server.ast  2007-10-28 09:18:39 +0000
+++ b/etc/gnus/news-server.ast  2010-03-23 07:29:49 +0000
@@ -2,9 +2,9 @@
 
 
 @node Setting up the news server name and port number
address@hidden server :string (gnus-getenv-nntpserver)
address@hidden server :string (or (gnus-getenv-nntpserver) "your-server-here")
 @variable port :number 119
address@hidden (assistant-validate-connect-to-server server port)
address@hidden (or (assistant-validate-connect-to-server server port) (y-or-n-p 
"Do you want to use the server anyway, although you can't confirm it's valid?"))
 @result gnus-select-method (list 'nntp server (list 'nntp-server port))
 @text
 Usenet news is usually read from your Internet service prodider's news
@@ -14,10 +14,10 @@
 
 Server name: @variable{server}
 Port number: @variable{port}
+
 @end text
 @next t "User name and password"
 
-
 @node User name and password
 @type interstitial
 @next