xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/man/Xorg.man |    2 +-
 man/Xserver.man         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 634e357be2ec400f63bd5c42f706b709b6ddabc3
Author: Ingo Schwarze <schwarze at usta.de>
Date:   Sun Aug 30 15:26:40 2015 +0200

    remove bogus \/ escapes
    
    some X manuals use then escape sequence \/ when they want to render
    a slash.  That's bad because \/ is not a slash but an italic
    correction, never producing any output, having no effect at all in
    terminal output, and only changing spacing in a minor way in typeset
    output.
    
    Signed-off-by: Matthieu Herrb <matthieu at herrb.eu>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index ddf1358..646a90c 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -46,7 +46,7 @@ On most platforms, the "Local" connection type is a UNIX-domain socket.
 On some System V platforms, the "local" connection types also include
 STREAMS pipes, named pipes, and some other mechanisms.
 .TP 4
-.I TCP\/IP
+.I TCP/IP
 .B Xorg
 listens on port
 .RI 6000+ n ,
diff --git a/man/Xserver.man b/man/Xserver.man
index dc4b07e..8a09888 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -433,7 +433,7 @@ elapse between autorepeat-generated keystrokes).
 loads keyboard description in \fIfilename\fP on server startup.
 .SH "NETWORK CONNECTIONS"
 The X server supports client connections via a platform-dependent subset of
-the following transport types: TCP\/IP, Unix Domain sockets, DECnet,
+the following transport types: TCP/IP, Unix Domain sockets, DECnet,
 and several varieties of SVR4 local connections.  See the DISPLAY
 NAMES section of the \fIX\fP(__miscmansuffix__) manual page to learn how to
 specify which transport type clients should try to use.