From 95d62d8af3fb5e24f368811afc3bc9970f6a9578 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 28 Oct 2004 06:37:48 +0000 Subject: [PATCH] (Fx_server_vendor, Fx_server_version): Doc fixes. --- src/w32fns.c | 4 ++-- src/xfns.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/w32fns.c b/src/w32fns.c index 1e52155ab3..38faa7c319 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6398,7 +6398,7 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the vendor ID string of the W32 system (Microsoft). + doc: /* Returns the "vendor ID" string of the W32 system (Microsoft). The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6411,7 +6411,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, doc: /* Returns the version numbers of the server of DISPLAY. The value is a list of three integers: the major and minor -version numbers, and the vendor-specific release +version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. The optional argument DISPLAY specifies which display to ask about. diff --git a/src/xfns.c b/src/xfns.c index ae308c562b..01d528e279 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3499,7 +3499,9 @@ If omitted or nil, that stands for the selected frame's display. */) } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the vendor ID string of the X server of display DISPLAY. + doc: /* Returns the "vendor ID" string of the X server of display DISPLAY. +\(Labelling every distributor as a "vendor" embodies the false assumption +that operating systems cannot be developed and distributed noncommercially.) The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3516,7 +3518,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, doc: /* Returns the version numbers of the X server of display DISPLAY. The value is a list of three integers: the major and minor -version numbers of the X Protocol in use, and the vendor-specific release +version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. The optional argument DISPLAY specifies which display to ask about. -- 2.20.1