Merge branch 'uli42-pr/fix_autodpi_in_usage' into 3.6.x

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");

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

nx-X11/programs/Xserver/os/utils.c

@@ -269,7 +269,9 @@ long Memory_fail = 0;
 #include <stdlib.h>  /* for random() */
 #endif
 
+#ifndef NXAGENT_SERVER
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
+#endif
 
 extern char dispatchExceptionAtReset;
 
@@ -628,7 +630,9 @@ void UseMsg(void)
     ErrorF("-terminate             terminate at server reset\n");
     ErrorF("-to #                  connection time out\n");
     ErrorF("-tst                   disable testing extensions\n");
+#ifndef NXAGENT_SERVER
     ErrorF("ttyxx                  server started from init on /dev/ttyxx\n");
+#endif
     ErrorF("v                      video blanking for screen-saver\n");
     ErrorF("-v                     screen-saver without video blanking\n");
     ErrorF("-wm                    WhenMapped default backing-store\n");
@@ -1036,11 +1040,13 @@ ProcessCommandLine(int argc, char *argv[])
 	    /* ignore all remaining arguments */
 	    break;
 	}
+#ifndef NXAGENT_SERVER
 	else if (strncmp (argv[i], "tty", 3) == 0)
 	{
 	    /* just in case any body is interested */
 	    dev_tty_from_init = argv[i];
 	}
+#endif
 #ifdef XDMCP
 	else if ((skip = XdmcpOptions(argc, argv, i)) != i)
 	{