summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-04-12 22:18:02 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-04-12 22:18:02 +0000
commit1e3b60017a8b10630ae53cd2412f9a21c0d4d661 (patch)
tree28045301ff70477f7ea676e410c97d0ee0182056 /doc
parent2d6af8ddfef95be7c54ff803926b6ddad69afb44 (diff)
downloademacs-1e3b60017a8b10630ae53cd2412f9a21c0d4d661.tar.gz
Merge changes made in Gnus trunk.
gnus.texi (Window Layout): @itemize @code doesn't exist. It's @table @code. gnus-registry.el (gnus-registry--split-fancy-with-parent-internal): Fix logic bug. (gnus-registry-post-process-groups): Fix logging of no results and quote sender and subject. network-stream.el (network-stream-open-starttls): Only do opportunistic STARTTLS upgrades if we have built-in gnutls support. Upgrades via gnutls-cli are too slow to be done opportunistically. gnus-start.el (gnus-get-unread-articles): Slight cleanup. (gnus-read-active-for-groups): Don't try to finish getting stuff where we had no early-data returned. (gnus-get-unread-articles): Add a sanity check so that we don't issue two async commands to the same server at the same time. gnus-sum.el (gnus-summary-select-article-buffer): Doc fix. gnus-registry.el (gnus-registry-remake-db): Put the warning on a "warning" level.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/gnus.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4daf5b1b9fb..6ffa9b51933 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus.texi (Window Layout): @itemize @code doesn't exist. It's @table
+ @code.
+
2011-03-19 Antoine Levitt <antoine.levitt@gmail.com>
* gnus.texi (Listing Groups): Document gnus-group-list-ticked
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 9771392f0cc..fa417997794 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -22836,7 +22836,7 @@ windows resized.
Here's a list of most of the currently known window configurations,
and when they're used:
-@itemize @code
+@table @code
@item group
The group buffer.
@@ -22903,7 +22903,7 @@ Composing a bounce message.
@item mml-preview
Previewing a @acronym{MIME} part.
-@end itemize
+@end table
@subsection Example Window Configurations