diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | README.md (renamed from README) | 17 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | man/startx.man | 20 | ||||
| -rw-r--r-- | man/xinit.man | 2 |
5 files changed, 16 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 5071c4d..4424c00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = xinitrc startx EXTRA_DIST = xinitrc.cpp startx.cpp \ - autogen.sh + autogen.sh README.md .PHONY: ChangeLog INSTALL @@ -3,27 +3,20 @@ client program on systems that are not using a display manager such as xdm. The xinit is not intended for naive users. Instead, site administrators should design user-friendly scripts that present the desired interface when starting -up X. The startx script is one such example. +up X. The startx script is one such example. All questions regarding this software should be directed at the Xorg mailing list: - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + https://lists.x.org/mailman/listinfo/xorg The master development code repository can be found at: - git://anongit.freedesktop.org/git/xorg/app/xinit + https://gitlab.freedesktop.org/xorg/app/xinit - http://cgit.freedesktop.org/xorg/app/xinit +Please submit bug reports and requests to merge patches there. For patch submission instructions, see: - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: + https://www.x.org/wiki/Development/Documentation/SubmittingPatches - http://wiki.x.org/wiki/GitPage diff --git a/configure.ac b/configure.ac index 5dd8a51..92fa096 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xinit], [1.3.4], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit]) +AC_INIT([xinit], [1.4.0], + [https://gitlab.freedesktop.org/xorg/app/xinit/issues], [xinit]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff --git a/man/startx.man b/man/startx.man index 4728a25..5a48c3d 100644 --- a/man/startx.man +++ b/man/startx.man @@ -54,25 +54,19 @@ Arguments immediately following the command are used to start a client in the same manner as .BR xinit (__appmansuffix__). The special argument -.RB '--' +.RB '\-\^\-' marks the end of client arguments and the beginning of server options. -It may be convenient to specify server options with startx to change on a -per-session basis the -default color depth, the server's notion of the number of dots-per-inch the -display device presents, or take advantage of a different server layout, as -permitted by the -.BR __XSERVERNAME__ (__appmansuffix__) -server and specified in the -.BR __XCONFIGFILEMAN__ -configuration. Some examples of specifying server arguments follow; consult +It may be convenient to specify server options with startx to change them on a +per-session basis. +Some examples of specifying server arguments follow; consult the manual page for your X server to determine which arguments are legal. .RS .PP -startx -- -depth 16 +startx \-\^\- \-depth 16 .PP -startx -- -dpi 100 +startx \-\^\- \-dpi 100 .PP -startx -- -layout Multihead +startx \-\^\- \-layout Multihead .RE .PP To determine the client to run, diff --git a/man/xinit.man b/man/xinit.man index de6e27c..d9d08df 100644 --- a/man/xinit.man +++ b/man/xinit.man @@ -161,7 +161,7 @@ novice users: .in +8 .nf \&#!/bin/sh -xinit __configdir__/site.xinitrc \-\^\- __bindir__/X -br +xinit __configdir__/site.xinitrc \-\^\- __bindir__/X \-br .fi .in -8 .sp |