13 files changed, 50 insertions, 49 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 210830a2b49..8b30834025f 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -261,7 +261,7 @@ but has not been processed yet.")
   "Non-nil when we're currently processing a message.
 
 When ERC receives a private message, it sets up a new buffer for
-this query.  These in turn, though, do start flyspell. This
+this query.  These in turn, though, do start flyspell.  This
 involves starting an external process, in which case Emacs will
 wait - and when it waits, it does accept other stuff from, say,
 network exceptions.  So, if someone sends you two messages
@@ -320,7 +320,7 @@ If a key is pressed while ERC is waiting, it will stop waiting."
   "The maximum length of a single message.
 If a message exceeds this size, it is broken into multiple ones.
 
-IRC allows for lines up to 512 bytes. Two of them are CR LF.
+IRC allows for lines up to 512 bytes.  Two of them are CR LF.
 And a typical message looks like this:
 
   :nicky!uhuser@host212223.dialin.fnordisp.net PRIVMSG #lazybastards :Hello!
@@ -347,8 +347,8 @@ This will only be consulted if the coding system in
 This is either a coding system, a cons, a function, or nil.
 
 If a cons, the encoding system for outgoing text is in the car
-and the decoding system for incoming text is in the cdr. The most
-interesting use for this is to put `undecided' in the cdr. This
+and the decoding system for incoming text is in the cdr.  The most
+interesting use for this is to put `undecided' in the cdr.  This
 means that `erc-coding-system-precedence' will be consulted, and the
 first match there will be used.
 
@@ -795,7 +795,7 @@ Use DISPLAY-FN to show the results."
 (defun erc-server-send (string &optional forcep target)
   "Send STRING to the current server.
 If FORCEP is non-nil, no flood protection is done - the string is
-sent directly. This might cause the messages to arrive in a wrong
+sent directly.  This might cause the messages to arrive in a wrong
 order.
 
 If TARGET is specified, look up encoding information for that
@@ -903,7 +903,7 @@ protection algorithm."
   "Send LINE to the server as a privmsg or a notice.
 MESSAGE-COMMAND should be either \"PRIVMSG\" or \"NOTICE\".
 If the target is \",\", the last person you've got a message from will
-be used. If the target is \".\", the last person you've sent a message
+be used.  If the target is \".\", the last person you've sent a message
 to will be used."
   (cond
    ((string-match "^\\s-*\\(\\S-+\\) ?\\(.*\\)" line)
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 726d9674d40..2dbf13cfdfd 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -71,7 +71,7 @@
   "Face used for highlighting buttons in ERC buffers.
 
 A button is a piece of text that you can activate by pressing
-`RET' or `mouse-2' above it. See also `erc-button-keymap'."
+`RET' or `mouse-2' above it.  See also `erc-button-keymap'."
   :type 'face
   :group 'erc-faces)
 
@@ -169,10 +169,10 @@ REGEXP is the string matching text around the button or a symbol
   current server.
 
 BUTTON is the number of the regexp grouping actually matching the
-  button,  This is ignored if REGEXP is \\='nicknames.
+  button.  This is ignored if REGEXP is \\='nicknames.
 
 FORM is a lisp expression which must eval to true for the button to
-  be added,
+  be added.
 
 CALLBACK is the function to call when the user push this button.
   CALLBACK can also be a symbol.  Its variable value will be used
@@ -459,7 +459,7 @@ For use on `completion-at-point-functions'."
       t)))
 
 (defun erc-browse-emacswiki (thing)
-  "Browse to thing in the emacs-wiki."
+  "Browse to THING in the emacs-wiki."
   (browse-url (concat erc-emacswiki-url thing)))
 
 (defun erc-browse-emacswiki-lisp (thing)
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index a2c9336826a..899ea2f6b5f 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -28,7 +28,7 @@
 (require 'erc)
 
 (defgroup erc-ezbounce nil
-  "Interface to the EZBounce IRC bouncer (a virtual IRC server)"
+  "Interface to the EZBounce IRC bouncer (a virtual IRC server)."
   :group 'erc)
 
 (defcustom erc-ezb-regexp "^ezbounce!srv$"
@@ -77,7 +77,7 @@ The alist's format is as follows:
 ;;;###autoload
 (defun erc-ezb-get-login (server port)
   "Return an appropriate EZBounce login for SERVER and PORT.
-Look up entries in `erc-ezb-login-alist'. If the username or password
+Look up entries in `erc-ezb-login-alist'.  If the username or password
 in the alist is nil, prompt for the appropriate values."
   (let ((login (cdr (assoc (cons server port) erc-ezb-login-alist))))
     (when login
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 934b52a938c..705c7e69bb5 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -109,7 +109,7 @@ nick names right and text left."
 
 (defcustom erc-fill-variable-maximum-indentation 17
   "If we indent a line after a long nick, don't indent more then this
-characters. Set to nil to disable."
+characters.  Set to nil to disable."
   :group 'erc-fill
   :type 'integer)
 
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 1c046fe20cb..2b9a0aae1da 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -340,7 +340,7 @@ filename is downcased."
   "Return the logfile to use for BUFFER.
 If BUFFER is nil, the value of `current-buffer' is used.
 This is determined by `erc-generate-log-file-name-function'.
-The result is converted to lowercase, as IRC is case-insensitive"
+The result is converted to lowercase, as IRC is case-insensitive."
   (unless buffer (setq buffer (current-buffer)))
   (with-current-buffer buffer
     (let ((target (or (buffer-name buffer) (erc-default-target)))
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index cc4b4a88f11..092b5953c42 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -199,8 +199,8 @@ When `away', log messages only when away."
 
 (defcustom erc-log-match-format "%t<%n:%c> %m"
   "Format for matched Messages.
-This variable specifies how messages in the corresponding log buffers will
-be formatted. The various format specs are:
+This variable specifies how messages in the corresponding log buffers
+will be formatted.  The various format specs are:
 
 %t Timestamp (uses `erc-timestamp-format' if non-nil or \"[%Y-%m-%d %H:%M] \")
 %n Nickname of sender
@@ -227,7 +227,7 @@ for beeping to work."
   "Hook run when text matches a given match-type.
 Functions in this hook are passed as arguments:
 \(match-type nick!user@host message) where MATCH-TYPE is a symbol of:
-current-nick, keyword, pal, dangerous-host, fool"
+current-nick, keyword, pal, dangerous-host, fool."
   :options '(erc-log-matches erc-hide-fools erc-beep-on-match)
   :group 'erc-match
   :type 'hook)
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 87c3a61b663..305fdf9d945 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -33,9 +33,9 @@
 (require 'erc)
 
 (defgroup erc-netsplit nil
-  "Netsplit detection tries to automatically figure when a
-netsplit happens, and filters the QUIT messages. It also keeps
-track of netsplits, so that it can filter the JOIN messages on a netjoin too."
+  "Netsplit detection tries to automatically figure when a netsplit
+happens, and filters the QUIT messages.  It also keeps track of
+netsplits, so that it can filter the JOIN messages on a netjoin too."
   :group 'erc)
 
 ;;;###autoload(autoload 'erc-netsplit-mode "erc-netsplit")
@@ -57,8 +57,7 @@ track of netsplits, so that it can filter the JOIN messages on a netjoin too."
   :type 'boolean)
 
 (defcustom erc-netsplit-debug nil
-  "If non-nil, debug messages will be shown in the
-sever buffer."
+  "If non-nil, debug messages will be shown in the sever buffer."
   :group 'erc-netsplit
   :type 'boolean)
 
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index eca8ad6a899..3ba5ce4e5e7 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -436,10 +436,11 @@
   ("ZiRC: Random server" ZiRC "irc.zirc.org" ((6660 6669)))
   ("ZUHnet: Random server" ZUHnet "irc.zuh.net" 6667)
   ("Zurna: Random server" Zurna "irc.zurna.net" 6667))
-  "Alist of irc servers. (NAME NET HOST PORTS) where
+  "Alist of irc servers.
+Each server is a list (NAME NET HOST PORTS) where
 NAME is a name for that server,
-NET is a symbol indicating to which network from `erc-networks-alist' this
-  server corresponds,
+NET is a symbol indicating to which network from `erc-networks-alist'
+  this server corresponds,
 HOST is the servers hostname and
 PORTS is either a number, a list of numbers, or a list of port ranges."
   :group 'erc-networks
@@ -706,12 +707,13 @@ PORTS is either a number, a list of numbers, or a list of port ranges."
     (ZiRC "zirc.org")
     (ZUHnet "zuh.net")
     (Zurna "zurna.net"))
-  "Alist of IRC networks. (NET MATCHER) where
+  "Alist of IRC networks.
+Each network is a list (NET MATCHER) where
 NET is a symbol naming that IRC network and
-MATCHER is used to find a corresponding network to a server while connected to
-  it. If it is regexp, it's used to match against `erc-server-announced-name'.
-  It can also be a function (predicate). Then it is executed with the
-  server buffer as current-buffer."
+MATCHER is used to find a corresponding network to a server while
+  connected to it.  If it is regexp, it's used to match against
+  `erc-server-announced-name'.  It can also be a function (predicate).
+  Then it is executed with the server buffer as current-buffer."
   :group 'erc-networks
   :type '(repeat
 	  (list :tag "Network"
@@ -749,8 +751,8 @@ search for a match in `erc-networks-alist'."
   (erc-with-server-buffer erc-network))
 
 (defun erc-current-network ()
-  "Deprecated.  Use `erc-network' instead.  Return the name of this server's
-network as a symbol."
+  "Deprecated.  Use `erc-network' instead.
+Return the name of this server's network as a symbol."
   (erc-with-server-buffer
     (intern (downcase (symbol-name erc-network)))))
 
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 453e234a37a..c5d62ccfea9 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -59,7 +59,7 @@ be recalled using M-p and M-n."
 (defvar erc-input-ring-index nil
   "Position in the input ring for erc.
 If nil, the input line is blank and the user is conceptually after
-the most recently added item in the ring. If an integer, the input
+the most recently added item in the ring.  If an integer, the input
 line is non-blank and displays the item from the ring indexed by this
 variable.")
 (make-variable-buffer-local 'erc-input-ring-index)
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 8d56c85bec4..a1e10ca3a24 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -42,7 +42,7 @@
 ;;; Customization:
 
 (defgroup erc-speedbar nil
-  "Integration of ERC in the Speedbar"
+  "Integration of ERC in the Speedbar."
   :group 'erc)
 
 (defcustom erc-speedbar-sort-users-type 'activity
@@ -270,8 +270,8 @@ INDENT is the current indentation level."
        indent))))
 
 (defun erc-speedbar-update-channel (buffer)
-  "Update the speedbar information about a ERC buffer. The update
-is only done when the channel is actually expanded already."
+  "Update the speedbar information about a ERC buffer.
+The update is only done when the channel is actually expanded already."
   ;; This is only a rude hack and doesn't care about multiserver usage
   ;; yet, consider this a brain storming, better ideas?
   (with-current-buffer speedbar-buffer
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index a15d8bf7b31..ee177e3acb5 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -212,7 +212,7 @@ This is used when `erc-insert-timestamp-function' is set to
   "Insert timestamp only if its value changed since last insertion.
 If `erc-insert-timestamp-function' is `erc-insert-timestamp-left', a
 string of spaces which is the same size as the timestamp is added to
-the beginning of the line in its place. If you use
+the beginning of the line in its place.  If you use
 `erc-insert-timestamp-right', nothing gets inserted in place of the
 timestamp."
   :group 'erc-stamp
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 53a59207839..055c2eb4850 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -245,7 +245,7 @@ The effect may be disabled by setting this variable to nil."
 (defcustom erc-track-position-in-mode-line 'before-modes
   "Where to show modified channel information in the mode-line.
 
-Setting this variable only has effects in GNU Emacs versions above 21.3.
+Setting this variable only has effect in GNU Emacs versions above 21.3.
 
 Choices are:
 `before-modes' - add to the beginning of `mode-line-modes',
@@ -328,7 +328,7 @@ important."
 
 
 (defun erc-track-remove-from-mode-line ()
-  "Remove `erc-track-modified-channels' from the mode-line"
+  "Remove `erc-track-modified-channels' from the mode-line."
   (when (boundp 'mode-line-modes)
     (setq mode-line-modes
 	  (remove '(t erc-modified-channels-object) mode-line-modes)))
@@ -628,7 +628,7 @@ because the debugger also causes changes to the window-configuration.")
 (defun erc-modified-channels-update (&rest _args)
   "This function updates the information in `erc-modified-channels-alist'
 according to buffer visibility.  It calls
-`erc-modified-channels-display' at the end. This should usually be
+`erc-modified-channels-display' at the end.  This should usually be
 called via `window-configuration-change-hook'.
 ARGS are ignored."
   (interactive)
@@ -864,7 +864,7 @@ is in `erc-mode'."
 
 (defvar erc-track-last-non-erc-buffer nil
   "Stores the name of the last buffer you were in before activating
-`erc-track-switch-buffers'")
+`erc-track-switch-buffers'.")
 
 (defun erc-track-sort-by-activest ()
   "Sort erc-modified-channels-alist by activity.
@@ -889,7 +889,7 @@ higher number than any other face in that list."
     count))
 
 (defun erc-track-sort-by-importance ()
-  "Sort erc-modified-channels-alist by importance.
+  "Sort `erc-modified-channels-alist' by importance.
 That means the position of the face in `erc-track-faces-priority-list'."
   (setq erc-modified-channels-alist
 	(sort erc-modified-channels-alist
@@ -898,8 +898,8 @@ That means the position of the face in `erc-track-faces-priority-list'."
 
 (defun erc-track-get-active-buffer (arg)
   "Return the buffer name of ARG in `erc-modified-channels-alist'.
-Negative arguments index in the opposite direction.  This direction is
-relative to `erc-track-switch-direction'"
+Negative arguments index in the opposite direction.  This direction
+is relative to `erc-track-switch-direction'."
   (let ((dir erc-track-switch-direction)
 	offset)
     (when (< arg 0)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index fd1bd5545da..74376b0cb3a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -558,7 +558,7 @@ of the list is of the form (USER . CHANNEL-DATA), where USER is
 an erc-server-user struct, and CHANNEL-DATA is either nil or an
 erc-channel-user struct.
 
-See also: `erc-sort-channel-users-by-activity'"
+See also: `erc-sort-channel-users-by-activity'."
   (let (users)
     (if (hash-table-p erc-channel-users)
         (maphash (lambda (_nick cdata)
@@ -739,7 +739,7 @@ See also: `erc-echo-notice-always-hook',
 `erc-echo-notice-in-active-buffer',
 `erc-echo-notice-in-user-buffers',
 `erc-echo-notice-in-user-and-target-buffers',
-`erc-echo-notice-in-first-user-buffer'"
+`erc-echo-notice-in-first-user-buffer'."
   :group 'erc-hooks
   :type 'hook
   :options '(erc-echo-notice-in-default-buffer
@@ -770,7 +770,7 @@ See also: `erc-echo-notice-hook',
 `erc-echo-notice-in-active-buffer',
 `erc-echo-notice-in-user-buffers',
 `erc-echo-notice-in-user-and-target-buffers',
-`erc-echo-notice-in-first-user-buffer'"
+`erc-echo-notice-in-first-user-buffer'."
   :group 'erc-hooks
   :type 'hook
   :options '(erc-echo-notice-in-default-buffer
@@ -4194,7 +4194,7 @@ Only happens when the session buffer isn't visible."
 Specifically in relation to NICK (user@host) information.  Returns REASON
 unmodified if nothing can be removed.
 E.g. \"Read error to Nick [user@some.host]: 110\" would be shortened to
-\"Read error: 110\". The same applies for \"Ping Timeout\"."
+\"Read error: 110\".  The same applies for \"Ping Timeout\"."
   (setq nick (regexp-quote nick)
         login (regexp-quote login)
         host (regexp-quote host))
@@ -4337,7 +4337,7 @@ See also `erc-format-nick-function'."
 
 (defun erc-format-@nick (&optional user _channel-data)
   "Format the nickname of USER showing if USER has a voice, is an
-operator, half-op, admin or owner. Owners have \"~\", admins have
+operator, half-op, admin or owner.  Owners have \"~\", admins have
 \"&\", operators have \"@\" and users with voice have \"+\" as a
 prefix.  Use CHANNEL-DATA to determine op and voice status.  See
 also `erc-format-nick-function'."