From: yamaoka <yamaoka>
Date: Wed, 28 Sep 2005 09:11:43 +0000 (+0000)
Subject: Synch to No Gnus 200509280911.
X-Git-Tag: t-gnus-6_17_4-quimby-~337
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=58d28db2e00cd18bfb79357b0ed7994ce73532a9;p=elisp%2Fgnus.git-

Synch to No Gnus 200509280911.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index cb7c35d..6585528 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -3,6 +3,7 @@
 	* gnus.texi (NNTP): Remove nntp-buggy-select, nntp-read-timeout,
 	nntp-server-hook, and nntp-warn-about-losing-connection; fix
 	description of nntp-open-connection-function.
+	(Common Variables): Fix descriptions.
 
 2005-09-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index 61de8b5..9247fc3 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -13039,7 +13039,9 @@ Address of the intermediate host to connect to.
 
 The following variables affect the behavior of all, or several of the
 pre-made connection functions.  When not specified, all functions are
-affected.
+affected (the values of the following variables will be used as the
+default if each virtual @code{nntp} server doesn't specify those server
+variables individually).
 
 @table @code
 
@@ -13047,7 +13049,7 @@ affected.
 @vindex nntp-pre-command
 A command wrapper to use when connecting through a non native
 connection function (all except @code{nntp-open-network-stream},
-@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}.  This is
+@code{nntp-open-tls-stream}, and @code{nntp-open-ssl-stream}).  This is
 where you would put a @samp{SOCKS} wrapper for instance.
 
 @item nntp-address