summaryrefslogtreecommitdiff
path: root/startx.man
diff options
context:
space:
mode:
authorKean Johnson <kean@armory.com>2005-11-08 06:33:33 +0000
committerKean Johnson <kean@armory.com>2005-11-08 06:33:33 +0000
commitaf47a9e0dd891dcaa52b12f4eda85381e0467916 (patch)
tree010644422d253e79e293881f666f5185254f8c96 /startx.man
parent6beb2e4769b8b3708f30ee7adf8037a4e1f39f3d (diff)
See ChangeLog entry 2005-11-07 for details.XORG-6_8_99_902
Diffstat (limited to 'startx.man')
-rw-r--r--startx.man29
1 files changed, 29 insertions, 0 deletions
diff --git a/startx.man b/startx.man
index 559c6d0..3087db4 100644
--- a/startx.man
+++ b/startx.man
@@ -72,6 +72,23 @@ startx -- -dpi 100
.PP
startx -- -layout Multihead
.RE
+#ifdef __SCOMAN__
+.PP
+To determine the client to run,
+.I startx
+looks for the following files, in order:
+.RS
+.PP
+.I $(HOME)/.startxrc
+.PP
+.I __libdir__/sys.startxrc
+.PP
+.I $(HOME)/.xinitrc
+.PP
+.I __xinitdir__/xinitrc
+.RE
+.PP
+#else
.PP
To determine the client to run,
.I startx
@@ -83,6 +100,7 @@ the file
in the
.I xinit
library directory.
+#endif
If command line client options are given, they override this
behavior and revert to the
.IR xinit (1)
@@ -166,6 +184,17 @@ and
.IR Xsecurity (__miscmansuffix__)
manual pages for more information on X client/server authentication.
.SH FILES
+#ifdef __SCOMAN__
+.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.
+#endif
.TP 25
.I $(HOME)/.xinitrc
Client to run. Typically a shell script which runs many programs in