aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-28 01:03:53 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-28 01:03:53 +0100
commit5c4777b2d3d3d06ee8af6bfd78289373e340ad52 (patch)
tree89015a452f1fa8488b0db6dda72244f1478d7874 /nx-X11/programs/Xserver/hw
parent1918bcb9c01fcf45727b514afb8ca8d978a2bf93 (diff)
parent809206d0cf79f367d852f180f1a5733420010689 (diff)
downloadnx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.tar.gz
nx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.tar.bz2
nx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.zip
Merge branch 'uli42-pr/fix_autodpi_in_usage' into 3.6.x
Attributes GH PR #667: https://github.com/ArcticaProject/nx-libs/pull/667
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c8
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.13
2 files changed, 4 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index c31acc26a..262c1dfdb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -2111,24 +2111,24 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
void ddxUseMsg(void)
{
- ErrorF("-display string display name of the real server\n");
- ErrorF("-sync synchronize with the real server\n");
ErrorF("-full utilize full regeneration\n");
ErrorF("-class string default visual class\n");
ErrorF("-depth int default depth\n");
ErrorF("-geometry WxH+X+Y window size and position\n");
- ErrorF("-autodpi detect real server's DPI and use that in the session\n");
ErrorF("-bw int window border width\n");
ErrorF("-name string window name\n");
ErrorF("-scrns int number of screens to generate\n");
ErrorF("-install install colormaps directly\n");
- ErrorF("The NX system adds the following arguments:\n");
+ ErrorF("\nThe NX system adds the following arguments:\n");
ErrorF("-options file|string file or string containing nx/nx options\n");
ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n");
ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n");
ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n");
ErrorF("-nomagicpixel disable nxagent's magic pixel\n");
+ ErrorF("-autodpi detect real server's DPI and use that in the session\n");
+ ErrorF("-display string display name of the real server\n");
+ ErrorF("-sync synchronize with the real server\n");
#ifdef RENDER
ErrorF("-norender disable the use of the render extension\n");
ErrorF("-nocomposite disable the use of the composite extension\n");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index e860857b7..995576b5c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -296,9 +296,6 @@ sets default connection timeout in seconds.
.B \-tst
disables all testing extensions.
.TP 8
-.B tty\fIxx\fP
-ignored, for servers started the ancient way (from init).
-.TP 8
.B v
sets video-off screen-saver preference.
.TP 8