diff options
| author | Lars Magne Ingebrigtsen | 2010-10-19 22:20:47 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2010-10-19 22:20:47 +0000 |
| commit | 2e76c12c577989479dc497fc3afdef3e04b263a1 (patch) | |
| tree | c1ccb6b7640cc926cd564a2f7e1127ecbb708578 /doc | |
| parent | 7f0789c9db1b26329e22157479d449d29ea50d34 (diff) | |
| download | emacs-2e76c12c577989479dc497fc3afdef3e04b263a1.tar.gz emacs-2e76c12c577989479dc497fc3afdef3e04b263a1.zip | |
Merge changes made in Gnus trunk.
gnus.texi (Customizing the IMAP Connection): The port strings are strings.
nnmairix.el (nnmairix-summary-mode-hook): Move nnmairix's `$' command to `G G' to avoid collisions.
shr.el (shr-parse-style, shr-tag-span): New functions.
nndoc.el (nndoc-type-alist): Add git support.
(nndoc-git-type-p, nndoc-transform-git-article, nndoc-transform-git-headers): New functions.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/gnus.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 1a1f0d48eb9..c0b504ef5b3 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -14872,7 +14872,7 @@ The address of the server, like @samp{imap.gmail.com}. | |||
| 14872 | 14872 | ||
| 14873 | @item nnimap-server-port | 14873 | @item nnimap-server-port |
| 14874 | If the server uses a non-standard port, that can be specified here. A | 14874 | If the server uses a non-standard port, that can be specified here. A |
| 14875 | typical port would be @samp{imap} or @samp{imaps}. | 14875 | typical port would be @code{"imap"} or @code{"imaps"}. |
| 14876 | 14876 | ||
| 14877 | @item nnimap-stream | 14877 | @item nnimap-stream |
| 14878 | How @code{nnimap} should connect to the server. Possible values are: | 14878 | How @code{nnimap} should connect to the server. Possible values are: |