(ifconfig): Renamed from ipconfig.

(ipconfig): Alas to ifconfig.
(ifconfig-program): Renamed from ipconfig-program.
(ifconfig-program-options): Renamed from ipconfig-program-options.

2 files changed, 18 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 243018e12b8..2732fb56bb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-08  Richard Stallman  <rms@gnu.org>
+
+        * net/net-utils.el (ifconfig): Renamed from ipconfig.
+        (ipconfig): Alas to ifconfig.
+        (ifconfig-program): Renamed from ipconfig-program.
+        (ifconfig-program-options): Renamed from ipconfig-program-options.
+
 2008-02-08  Glenn Morris  <rgm@gnu.org>
 
         * custom.el (custom-theme-set-variables): Sort symbols that are
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index fcfb8524b09..bc235b71f94 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -93,7 +93,7 @@ These options can be used to limit how many ICMP packets are emitted."
   :group 'net-utils
   :type  '(repeat string))
 
-(defcustom ipconfig-program
+(defcustom ifconfig-program
   (if (eq system-type 'windows-nt)
       "ipconfig"
     "ifconfig")
@@ -101,11 +101,11 @@ These options can be used to limit how many ICMP packets are emitted."
   :group 'net-utils
   :type  'string)
 
-(defcustom ipconfig-program-options
+(defcustom ifconfig-program-options
   (list
    (if (eq system-type 'windows-nt)
        "/all" "-a"))
-  "Options for ipconfig-program."
+  "Options for `ifconfig-program'."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -352,18 +352,18 @@ If your system's ping continues until interrupted, you can try setting
      options)))
 
 ;;;###autoload
-(defun ipconfig ()
-  "Run ipconfig program."
+(defun ifconfig ()
+  "Run ifconfig program."
   (interactive)
   (net-utils-run-program
-   "Ipconfig"
-   (concat "** Ipconfig ** " ipconfig-program " ** ")
-   ipconfig-program
-   ipconfig-program-options))
+   "Ifconfig"
+   (concat "** Ifconfig ** " ifconfig-program " ** ")
+   ifconfig-program
+   ifconfig-program-options))
 
-;; This is the normal name on most Unixes.
+;; Windows uses this name.
 ;;;###autoload
-(defalias 'ifconfig 'ipconfig)
+(defalias 'ipconfig 'ifconfig)
 
 ;;;###autoload
 (defun netstat ()