diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2015-03-28 18:16:10 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2015-03-28 18:16:10 +0100 |
| commit | e2731ebb3871d1b104e9926cc80a1e2f35dd37fc (patch) | |
| tree | 8a95d1aed5b0c5ee091429e79cb6c87123f152c7 /man/startx.man | |
| parent | f3a351f86a938152edbfccc6462bf34396113f1e (diff) | |
| parent | c5e40f503420bd61c7a33e082db755c03c070c81 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'man/startx.man')
| -rw-r--r-- | man/startx.man | 26 |
1 files changed, 0 insertions, 26 deletions
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 |