Merge remote-tracking branch 'origin/master' into obsdobsd

3 files changed, 3 insertions, 3 deletions

diff --git a/launchd/privileged_startx/10-tmpdirs.cpp b/launchd/privileged_startx/10-tmpdirs.cpp
index 4366696..ec79ae4 100755
--- a/launchd/privileged_startx/10-tmpdirs.cpp
+++ b/launchd/privileged_startx/10-tmpdirs.cpp
@@ -54,7 +54,7 @@ for dir in /tmp/.ICE-unix /tmp/.X11-unix /tmp/.font-unix ; do
 		# Use mktemp rather than mkdir to avoid possible security issue
 		# if $dir exists and is a symlink (ie protect against a race
 		# against the above check)
-		if ${MKTEMP} -d ${dir} >& /dev/null ; then
+		if ${MKTEMP} -d ${dir} > /dev/null 2>&1 ; then
 			chmod 1777 $dir
 			chown root:wheel $dir
 			success=1
diff --git a/man/startx.man b/man/startx.man
index 2fe952d..1c48a66 100644
--- a/man/startx.man
+++ b/man/startx.man
@@ -177,7 +177,7 @@ will be used.
 .TP 25
 XSERVERRC
 This variable should contain the location of an xserver file. If unset,
-.I $(HOME)/.xinitrc
+.I $(HOME)/.xserverrc
 or
 .I __xinitdir__/xserverrc
 will be used.
diff --git a/startx.cpp b/startx.cpp
index ff56efd..c1c9acd 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -52,7 +52,7 @@ userclientrc=$HOME/.xinitrc
 sysclientrc=XINITDIR/xinitrc
 
 userserverrc=$HOME/.xserverrc
-[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}"
+[ -f "${XSERVERRC}" ] && userserverrc="${XSERVERRC}"
 sysserverrc=XINITDIR/xserverrc
 defaultclient=XTERM
 defaultserver=XSERVER