# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1269329525 0
# Node ID 2348ff8393d20e27cd8c7f35cdd033d34483b63a
# Parent  008c1c06812bca429d52824926f5247d858f72cb# Parent  a213d79a9aaecbdc8b9be75d053bcca7d9dd3717
Synch with Gnus trunk
=====================
2010-03-22  Teodor Zlatanov  <tzz@lifelogs.com>

 * gnus/gnus-setup.ast: Add finish links to the top nodes.

 * gnus/news-server.ast: Add some trivial validation.

diff -r 008c1c06812b -r 2348ff8393d2 etc/ChangeLog
--- a/etc/ChangeLog	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/ChangeLog	Tue Mar 23 07:32:05 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-22  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus/gnus-setup.ast: Add finish links to the top nodes.
+
+	* gnus/news-server.ast: Add some trivial validation.
+
 2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
 
 	* NEWS: Add secrets.el.
diff -r 008c1c06812b -r 2348ff8393d2 etc/gnus/gnus-setup.ast
--- a/etc/gnus/gnus-setup.ast	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/gnus/gnus-setup.ast	Tue Mar 23 07:32:05 2010 +0000
@@ -33,6 +33,8 @@
 
 @end text
 
+@next '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
 
+@next 'finish
+
 
 @c Local variables:
 @c mode: texinfo
diff -r 008c1c06812b -r 2348ff8393d2 etc/gnus/news-server.ast
--- a/etc/gnus/news-server.ast	Tue Mar 23 09:16:57 2010 +0200
+++ b/etc/gnus/news-server.ast	Tue Mar 23 07:32:05 2010 +0000
@@ -2,9 +2,9 @@
 
 
 @node Setting up the news server name and port number
-@variable server :string (gnus-getenv-nntpserver)
+@variable server :string (or (gnus-getenv-nntpserver) "your-server-here")
 @variable port :number 119
-@validate (assistant-validate-connect-to-server server port)
+@validate (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