diff options
| author | Po Lu | 2024-08-13 09:12:30 +0800 |
|---|---|---|
| committer | Po Lu | 2024-08-13 09:12:30 +0800 |
| commit | 6533fd65b6f187af5fe7202fc4ab344cc3df4cb1 (patch) | |
| tree | d380d3f3d899cf69ca4008e351b8239c196c6eb9 /doc/misc | |
| parent | cd66b848128a4cc4dbb1958d23ed023c9fad69ef (diff) | |
| parent | b585826a65ebfb58d3fe4744f0f8f9b5f3fc08cc (diff) | |
| download | emacs-6533fd65b6f187af5fe7202fc4ab344cc3df4cb1.tar.gz emacs-6533fd65b6f187af5fe7202fc4ab344cc3df4cb1.zip | |
Merge from savannah/emacs-30
b585826a65e ; * lisp/files.el (require-with-check): Fix doc string an...
6d55e94996e macOS: Wrong frame rectangle after wake (bug#71912)
c49724b9649 ; Grammar fixes
5c3d340e001 Fix format 2 cmap handling in sfnt.c
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/erc.texi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index c7822793a20..9cfb12c9231 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi | |||
| @@ -867,8 +867,8 @@ ERC's auth-source integration}. | |||
| 867 | @defun erc-compute-server &optional server | 867 | @defun erc-compute-server &optional server |
| 868 | Return an IRC server name. | 868 | Return an IRC server name. |
| 869 | 869 | ||
| 870 | This tries a number of increasingly more default methods until a non-@code{nil} | 870 | This tries a progressively greater number of default methods until a |
| 871 | value is found. | 871 | non-@code{nil} value is found. |
| 872 | 872 | ||
| 873 | @itemize @bullet | 873 | @itemize @bullet |
| 874 | @item @var{server} (the argument passed to this function) | 874 | @item @var{server} (the argument passed to this function) |
| @@ -888,8 +888,8 @@ IRC server to use if one is not provided. | |||
| 888 | @defun erc-compute-port &optional port | 888 | @defun erc-compute-port &optional port |
| 889 | Return a port for an IRC server. | 889 | Return a port for an IRC server. |
| 890 | 890 | ||
| 891 | This tries a number of increasingly more default methods until a non-@code{nil} | 891 | This tries a progressively greater number of default methods until a |
| 892 | value is found. | 892 | non-@code{nil} value is found. |
| 893 | 893 | ||
| 894 | @itemize @bullet | 894 | @itemize @bullet |
| 895 | @item @var{port} (the argument passed to this function) | 895 | @item @var{port} (the argument passed to this function) |
| @@ -910,7 +910,7 @@ This can be either a string or a number. | |||
| 910 | @defun erc-compute-nick &optional nick | 910 | @defun erc-compute-nick &optional nick |
| 911 | Return user's IRC nick. | 911 | Return user's IRC nick. |
| 912 | 912 | ||
| 913 | This tries a number of increasingly more default methods until a | 913 | This tries a progressively greater number of default methods until a |
| 914 | non-@code{nil} value is found. | 914 | non-@code{nil} value is found. |
| 915 | 915 | ||
| 916 | @itemize | 916 | @itemize |
| @@ -1010,7 +1010,7 @@ auth-source facility to retrieve a server password, although hitting | |||
| 1010 | @defun erc-compute-full-name &optional full-name | 1010 | @defun erc-compute-full-name &optional full-name |
| 1011 | Return user's full name. | 1011 | Return user's full name. |
| 1012 | 1012 | ||
| 1013 | This tries a number of increasingly more default methods until a | 1013 | This tries a progressively greater number of default methods until a |
| 1014 | non-@code{nil} value is found. | 1014 | non-@code{nil} value is found. |
| 1015 | 1015 | ||
| 1016 | @itemize @bullet | 1016 | @itemize @bullet |