More doc fixes for bug#19502 -- make documentation less X-specific.

 doc/lispref/frames.texi (Display Feature Testing): Make the description of
 x-server-version and x-server-vendor less X-specific.

 Make doc strings on X and w32 identical.
 src/w32fns.c (Fx_server_version, Fx_server_vendor): Doc fix.
 src/xfns.c (Fx_server_version, Fx_server_vendor): Doc fix.

2 files changed, 20 insertions, 9 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c4b80a03575..c898af51686 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * frames.texi (Display Feature Testing): Make the description of
+        x-server-version and x-server-vendor less X-specific.  (Bug#19502)
+
 2014-12-24  Glenn Morris  <rgm@gnu.org>
 
         * control.texi (Pattern matching case statement):
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 2d5922732c6..3c27ab15566 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2645,20 +2645,26 @@ colors).
 This function returns the number of color cells the screen supports.
 @end defun
 
-  These functions obtain additional information specifically
-about X displays.
+  These functions obtain additional information about the window
+system in use where Emacs shows the specified @var{display}.  (Their
+names begin with @code{x-} for historical reasons.)
 
 @defun x-server-version &optional display
-This function returns the list of version numbers of the X server
-running the display.  The value is a list of three integers: the major
-and minor version numbers of the X protocol, and the
-distributor-specific release number of the X server software itself.
+This function returns the list of version numbers of the GUI window
+system running on @var{display}, such as the X server on GNU and Unix
+systems.  The value is a list of three integers: the major and minor
+version numbers of the protocol, and the distributor-specific release
+number of the window system software itself.  On GNU and Unix systems,
+these are normally the version of the X protocol and the
+distributor-specific release number of the X server software.  On
+MS-Windows, this is the version of the Windows OS.
 @end defun
 
 @defun x-server-vendor &optional display
-This function returns the ``vendor'' that provided the X server
-software (as a string).  Really this means whoever distributes the X
-server.
+This function returns the ``vendor'' that provided the window system
+software (as a string).  On GNU and Unix systems this really means
+whoever distributes the X server.  On MS-Windows this is the vendor ID
+string of the Windows OS (Microsoft).
 
 When the developers of X labeled software distributors as
 ``vendors'', they showed their false assumption that no system could