[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7397d0fd19: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master 7397d0fd19: Merge from origin/emacs-28 |
Date: |
Fri, 8 Jul 2022 00:55:13 -0400 (EDT) |
branch: master
commit 7397d0fd1910aee37c287bb02c5bb2b7811be860
Merge: b6a90b71a2 2ac0ddc4ac
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
2ac0ddc4ac ; * lisp/net/net-utils.el: Minor doc fixes.
---
lisp/net/net-utils.el | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index ab7770e04a..b74400cd96 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -23,11 +23,10 @@
;;; Commentary:
-;;
;; There are three main areas of functionality:
;;
;; * Wrap common network utility programs (ping, traceroute, netstat,
-;; nslookup, arp, route). Note that these wrappers are of the diagnostic
+;; nslookup, arp, route). Note that these wrappers are of the diagnostic
;; functions of these programs only.
;;
;; * Implement some very basic protocols in Emacs Lisp (finger and whois)
@@ -39,7 +38,7 @@
;;; Code:
;; On some systems, programs like ifconfig are not in normal user
-;; path, but rather in /sbin, /usr/sbin, etc (but non-root users can
+;; path, but rather in /sbin, /usr/sbin, etc. (but non-root users can
;; still use them for queries). Actually the trend these
;; days is for /sbin to be a symlink to /usr/sbin, but we still need to
;; search both for older systems.