summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2015-02-13 19:37:16 -0500
committerGaetan Nadon <memsize@videotron.ca>2015-02-16 12:08:39 -0500
commit5268936259c598ea1e51370df33011a48ec9f3d4 (patch)
treecd813f4a5a081df5e0fa8e5ec561f48fbb7a1e9f /man
parente3bab0cc706880c22f2b205e7abad9d8c0227071 (diff)
downloadxorg-app-xinit-5268936259c598ea1e51370df33011a48ec9f3d4.tar.gz
Remove SCO support for SHELL_CMD and startx man page.
SCO support was removed from startx.cpp and xinitrc.cpp earlier. Remove unixware / sco support http://cgit.freedesktop.org/xorg/app/xinit/commit/ ?id=fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'man')
-rw-r--r--man/Makefile.am1
-rw-r--r--man/startx.man26
2 files changed, 0 insertions, 27 deletions
diff --git a/man/Makefile.am b/man/Makefile.am
index b24faca..9c6569f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,7 +13,6 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
-e 's|__xinitdir__|$(XINITDIR)|g' \
-e 's|__bindir__|$(bindir)|g' \
-e 's|__libdir__|$(libdir)|g' \
- -e 's|__SCOMAN__|$(SCOMAN)|g' \
-e 's|__configdir__|$(XINITDIR)|g'
diff --git a/man/startx.man b/man/startx.man
index 0405be0..4728a25 100644
--- a/man/startx.man
+++ b/man/startx.man
@@ -74,7 +74,6 @@ startx -- -dpi 100
.PP
startx -- -layout Multihead
.RE
-.if '__SCOMAN__'' .ig
.PP
To determine the client to run,
.B startx
@@ -90,20 +89,6 @@ looks for the following files, in order:
.I __xinitdir__/xinitrc
.RE
.PP
-..
-.if !'x.__SCOMAN__'x.' .ig
-.PP
-To determine the client to run,
-.B startx
-first looks for a file called
-.I .xinitrc
-in the user's home directory. If that is not found, it uses
-the file
-.I xinitrc
-in the
-.I xinit
-library directory.
-..
If command line client options are given, they override this
behavior and revert to the
.BR xinit (__appmansuffix__)
@@ -187,17 +172,6 @@ and
.IR Xsecurity (__miscmansuffix__)
manual pages for more information on X client/server authentication.
.SH FILES
-.if '__SCOMAN__'' .ig
-.TP 25
-.I $(HOME)/.startxrc
-Client to run. Typically a shell script which runs many programs in
-the background.
-.TP 25
-.I __libdir__/sys.startxrc
-Client to use if the user has no
-.I .startxrc
-file.
-..
.TP 25
.I $(HOME)/.xinitrc
Client to run. Typically a shell script which runs many programs in