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.

3 files changed, 13 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f845ab98bf0..bc750afacb3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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 --git a/etc/gnus/gnus-setup.ast b/etc/gnus/gnus-setup.ast
index 2893c40b245..31eeee024e1 100644
--- a/etc/gnus/gnus-setup.ast
+++ b/etc/gnus/gnus-setup.ast
@@ -33,6 +33,8 @@ Your mail can be downloaded into Gnus in several ways, choose one:
 
 @end text
 
+@next 'finish
+
 @node Setting up a NNTP server
 
 @text
@@ -40,6 +42,8 @@ TODO: this will be a real link.
 Run M-x assistant and use the news-server.ast file as input.
 @end text
 
+@next 'finish
+
 
 @c Local variables:
 @c mode: texinfo
diff --git a/etc/gnus/news-server.ast b/etc/gnus/news-server.ast
index 294f92382d9..432f71a50f0 100644
--- a/etc/gnus/news-server.ast
+++ b/etc/gnus/news-server.ast
@@ -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 @@ As a guess, the name of the server might be news.yourisp.com.
 
 Server name: @variable{server}
 Port number: @variable{port}
+
 @end text
 @next t "User name and password"
 
-
 @node User name and password
 @type interstitial
 @next