xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 man/Xserver.man |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 845c4ae5187f959fe042129e7c62210535f94290
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 14 18:41:33 2025 -0700

    Xserver.man: correct list of available authorization protocols
    
    XDM-AUTHORIZATION-2 (IPv6 capable version of -1) was never merged.
    SUN-DES-1 was removed by commit 71b207a2e in 2024
    MIT-KERBEROS-5 was removed by commit dfbe32b5b in 2007
    
    Fixes: 71b207a2e ("os: drop SUN-DES-1 authentication")
    Fixes: dfbe32b5b ("Remove the old Kerberos 5 authentication code.")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1913>

diff --git a/man/Xserver.man b/man/Xserver.man
index cf2dc7396..13f774fa4 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -462,7 +462,8 @@ specify which transport type clients should try to use.
 .SH GRANTING ACCESS
 The X server implements a platform-dependent subset of the following
 authorization protocols: MIT-MAGIC-COOKIE-1, XDM-AUTHORIZATION-1,
-XDM-AUTHORIZATION-2, SUN-DES-1, and MIT-KERBEROS-5.  See the
+Host Access, and Server Interpreted.
+See the
 .BR Xsecurity (@miscmansuffix@)
 manual page for information on the operation of these protocols.
 .PP
commit 80ad8a2c6d6e5d2d1861ce71d3b5dc5df15ea96a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 14 15:56:34 2025 -0700

    Xserver.man: add Xwayland(1) to list of server-specific man pages
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1913>

diff --git a/man/Xserver.man b/man/Xserver.man
index 25e6152df..cf2dc7396 100644
--- a/man/Xserver.man
+++ b/man/Xserver.man
@@ -652,6 +652,7 @@ Controlling the server once started:
 .PP
 Server-specific man pages:
 .BR Xorg (1), 
+.BR Xwayland (1),
 .BR Xephyr (1), 
 .BR Xnest (1),
 .BR Xvfb (1),