4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/unix/vncserver.man.manpages tigervnc-1.2.80-20130314svn5065/unix/vncserver.man
4b5b9a
--- tigervnc-1.2.80-20130314svn5065/unix/vncserver.man.manpages	2013-07-03 12:44:03.820392690 +0100
4b5b9a
+++ tigervnc-1.2.80-20130314svn5065/unix/vncserver.man	2013-07-03 12:44:44.222587028 +0100
4b5b9a
@@ -92,6 +92,10 @@ argument.  Thus, you can invoke "vncserv
4b5b9a
 end of your xstartup file after a particular application exits.
4b5b9a
 
4b5b9a
 .TP
4b5b9a
+.B \-list
4b5b9a
+Lists running VNC servers.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
 .B \-fp \fIfont-path\fP
4b5b9a
 If the vncserver script detects that the X Font Server (XFS) is running, it
4b5b9a
 will attempt to start Xvnc and configure Xvnc to use XFS for font handling.
4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/unix/vncserver.manpages tigervnc-1.2.80-20130314svn5065/unix/vncserver
4b5b9a
--- tigervnc-1.2.80-20130314svn5065/unix/vncserver.manpages	2013-07-03 12:39:08.754980784 +0100
4b5b9a
+++ tigervnc-1.2.80-20130314svn5065/unix/vncserver	2013-07-03 12:43:57.932364387 +0100
4b5b9a
@@ -551,6 +551,7 @@ sub Usage
4b5b9a
 	"                 [-geometry <width>x<height>]\n".
4b5b9a
 	"                 [-pixelformat rgbNNN|bgrNNN]\n".
4b5b9a
 	"                 [-fp <font-path>]\n".
4b5b9a
+	"                 [-cc <visual>]\n".
4b5b9a
 	"                 [-fg]\n".
4b5b9a
 	"                 [-autokill]\n".
4b5b9a
 	"                 <Xvnc-options>...\n\n".
4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.cxx.manpages tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.cxx
4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man.manpages tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man
4b5b9a
--- tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man.manpages	2013-07-03 12:46:17.814038117 +0100
4b5b9a
+++ tigervnc-1.2.80-20130314svn5065/unix/x0vncserver/x0vncserver.man	2013-07-03 12:58:32.814621597 +0100
4b5b9a
@@ -68,7 +68,13 @@ to accept connections from any IP addres
4b5b9a
 Specify which security scheme to use for incoming connections.  Valid values
4b5b9a
 are \fBNone\fP and \fBVncAuth\fP.  Default is \fBVncAuth\fP.
4b5b9a
 .TP
4b5b9a
-.B PasswordFile
4b5b9a
+.B pam_server
4b5b9a
+Service name for pam password validation (default is "vnc").
4b5b9a
+.TP
4b5b9a
+.B PlainUsers
4b5b9a
+Users permission to access via Plain security type.
4b5b9a
+.TP
4b5b9a
+.B PasswordFile, rfbauth
4b5b9a
 Password file for VNC authentication.  There is no default, you should
4b5b9a
 specify the password file explicitly.  Password file should be created with
4b5b9a
 the \fBvncpasswd\fP(1) utility.
4b5b9a
@@ -113,6 +119,16 @@ Accept key press and release events from
4b5b9a
 .B AcceptPointerEvents
4b5b9a
 Accept pointer events from clients.  Default is on.
4b5b9a
 .TP
4b5b9a
+.B AcceptCutText
4b5b9a
+Accept clipboard updates from clients.  Default is on.
4b5b9a
+.TP
4b5b9a
+.B MaxCutText
4b5b9a
+Maximum permitted length of an incoming clipboard update (default is
4b5b9a
+262144).
4b5b9a
+.TP
4b5b9a
+.B SendCutText
4b5b9a
+Send clipboard changes to clients.  Default is on.
4b5b9a
+.TP
4b5b9a
 .B RemapKeys
4b5b9a
 Comma-separated list of incoming keysyms to remap.  Mappings are expressed as
4b5b9a
 two hex values, prefixed by \fB0x\fP, and separated by \fB->\fP (`dash' and
4b5b9a
@@ -154,23 +170,6 @@ clients may choose video selection thems
4b5b9a
 \fBVideoArea\fP parameter will take effect.  If the argument is empty, no
4b5b9a
 video area is set (this is the default).
4b5b9a
 .TP
4b5b9a
-.B VideoPriority
4b5b9a
-Specify the priority of sending video updates.  \fBx0vncserver\fP can be
4b5b9a
-instructed to treat certain rectangular part of the screen as a video area
4b5b9a
-and handle it in a special way for improved performance (see documentation on
4b5b9a
-the \fBVideoArea\fP parameter).  \fBVideoPriority\fP value controls how often
4b5b9a
-video area will be sent to clients as compared to the rest of the screen.
4b5b9a
-The priority must be an integer between 0 and 8, and the default value is 2.
4b5b9a
-
4b5b9a
-\fBVideoPriority\fP set to 1 gives the same priority both to video and to
4b5b9a
-other pixels.  Higher values give more priority to video.  For example, the
4b5b9a
-value 5 specifies that the rate of sending video will be five times higher
4b5b9a
-than the rate of updating the rest of the screen.  If \fBVideoPriority\fP is
4b5b9a
-set to 0, it gives equal priority to video and other updates (just like the
4b5b9a
-value 1) and also disables special encoding for video data.  In other words,
4b5b9a
-\fBVideoPriority\fP video area will be sent as a part of other screen
4b5b9a
-contents.
4b5b9a
-.TP
4b5b9a
 .B CompareFB
4b5b9a
 Perform pixel comparison on framebuffer to reduce unnecessary updates.
4b5b9a
 Default is on.
4b5b9a
@@ -185,15 +184,6 @@ This enables system-specific access to c
4b5b9a
 screen (the default X visual often provides 256 colors).  Also, in overlay
4b5b9a
 mode, \fBx0vncserver\fP can show correct mouse cursor.  Default is on.
4b5b9a
 .TP
4b5b9a
-.B UseHardwareJPEG
4b5b9a
-Use hardware-accelerated JPEG compressor for video if available.
4b5b9a
-\fBx0vncserver\fP can be instructed to treat certain rectangular part of the
4b5b9a
-screen as a video area and handle it in a special way for improved
4b5b9a
-performance.  If the client supports Tight encoding and JPEG compression,
4b5b9a
-such video areas will be sent as JPEG-encoded rectangles.  And if this option
4b5b9a
-is on, compression will be hardware-accelerated (currently, supported only in
4b5b9a
-SGI/IRIX equipped with appropriate hardware).  Default is on.
4b5b9a
-.TP
4b5b9a
 .B ZlibLevel
4b5b9a
 Zlib compression level for ZRLE encoding (it does not affect Tight encoding).
4b5b9a
 Acceptable values are between 0 and 9.  Default is to use the standard
4b5b9a
@@ -222,6 +212,18 @@ Terminate after \fIN\fP seconds of user
4b5b9a
 .B ClientWaitTimeMillis
4b5b9a
 The number of milliseconds to wait for a client which is no longer
4b5b9a
 responding.  Default is 20000.
4b5b9a
+.TP
4b5b9a
+.B DeferUpdate
4b5b9a
+Time in milliseconds to defer updates (default is 1).
4b5b9a
+.TP
4b5b9a
+.B AlwaysSetDeferUpdateTimer
4b5b9a
+Always reset the defer update timer on every change.
4b5b9a
+.TP
4b5b9a
+.B x509key
4b5b9a
+Path to key of the x509 certificate in PEM format.
4b5b9a
+.TP
4b5b9a
+.B 509cert
4b5b9a
+Path to x509 certificate in PEM format.
4b5b9a
 .SH SEE ALSO
4b5b9a
 .BR Xvnc (1),
4b5b9a
 .BR vncpasswd (1),
4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx.manpages tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx
4b5b9a
--- tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx.manpages	2013-07-03 12:00:58.005856116 +0100
4b5b9a
+++ tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.cxx	2013-07-03 12:04:26.083023050 +0100
4b5b9a
@@ -261,6 +261,11 @@ static void usage(const char *programNam
4b5b9a
           "       %s [parameters] -listen [port] [parameters]\n",
4b5b9a
           programName, programName);
4b5b9a
   fprintf(stderr,"\n"
4b5b9a
+	  "Options:\n\n"
4b5b9a
+	  "  -display Xdisplay - Specifies the X display for the viewer window\n"
4b5b9a
+	  "  -geometry geometry - Standard X position and sizing specification.\n");
4b5b9a
+
4b5b9a
+  fprintf(stderr,"\n"
4b5b9a
           "Parameters can be turned on with -<param> or off with -<param>=0\n"
4b5b9a
           "Parameters which take a value can be specified as "
4b5b9a
           "-<param> <value>\n"
4b5b9a
diff -up tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man.manpages tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man
4b5b9a
--- tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man.manpages	2013-07-03 11:40:48.905078300 +0100
4b5b9a
+++ tigervnc-1.2.80-20130314svn5065/vncviewer/vncviewer.man	2013-07-03 12:00:13.116604372 +0100
4b5b9a
@@ -113,12 +113,53 @@ Xvnc supports reverse connections with a
4b5b9a
 .B vncconfig.
4b5b9a
 
4b5b9a
 .TP
4b5b9a
-.B \-passwd \fIpassword-file\fP
4b5b9a
+.B \-passwd \fIpassword-file\fP, \-PasswordFile \fIpassword-file\fP
4b5b9a
 If you are on a filesystem which gives you access to the password file used by
4b5b9a
 the server, you can specify it here to avoid typing it in.  It will usually be
4b5b9a
 "~/.vnc/passwd".
4b5b9a
 
4b5b9a
 .TP
4b5b9a
+.B \-DotWhenNoCursor
4b5b9a
+Show the dot cursor when the server sends an invisible cursor.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-PointerEventInterval
4b5b9a
+Time in milliseconds to rate-limit successive pointer events.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-ImprovedHextile
4b5b9a
+Try harder to compress data (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-QualityLevel \fIlevel\fP
4b5b9a
+JPEG quality level (default is 8).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-NoJPEG
4b5b9a
+Disable lossy JPEG compression in Tight encoding.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B CompressLevel \fIlevel\fP
4b5b9a
+Use specified compression level (default is 2).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B CustomCompressLevel \fIlevel\fP
4b5b9a
+Use custom compression level. Default is CompressLevel is specified.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-SendPrimary
4b5b9a
+Send the primary selection and cut buffer to the server as well as the
4b5b9a
+clipboard selection (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-SendClipboard
4b5b9a
+Send clipboard changes to the server (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-AcceptClipboard
4b5b9a
+Accept clipboard changes from the server (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
 .B \-Shared
4b5b9a
 When you make a connection to a VNC server, all other existing connections are
4b5b9a
 normally closed.  This option requests that they be left open, allowing you to
4b5b9a
@@ -140,6 +181,19 @@ Maximize viewer window.
4b5b9a
 Start in full-screen mode.
4b5b9a
 
4b5b9a
 .TP
4b5b9a
+.B \-FullScreenAllMonitors
4b5b9a
+Enable full screen over all monitors (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-FullscreenSystemKeys
4b5b9a
+Pass special keys directly to the server in full-screen mode.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-RemoteResize
4b5b9a
+Dynamically resize the remote desktop size as the size of the local
4b5b9a
+client window changes (default).
4b5b9a
+
4b5b9a
+.TP
4b5b9a
 .B \-DesktopSize \fIwidth\fPx\fIheight\fP
4b5b9a
 Instead of keeping the existing remote screen size, the client will attempt to
4b5b9a
 switch to the specified since when connecting. If the server does not support
4b5b9a
@@ -214,6 +268,22 @@ command is executed with the environment
4b5b9a
 host, the port number on the remote host, and the gateway machine
4b5b9a
 respectively.
4b5b9a
 
4b5b9a
+.TP
4b5b9a
+\fB\-ZlibLevel\fR \fIlevel\fR
4b5b9a
+Zlib compression level.
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-x509crl \fIfile\fP
4b5b9a
+X509 CRL file
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-x509ca \fIfile\fP
4b5b9a
+X509 CA certificate
4b5b9a
+
4b5b9a
+.TP
4b5b9a
+.B \-SecurityTypes \fItypes\fP
4b5b9a
+Specify which security scheme to use.
4b5b9a
+
4b5b9a
 .SH SEE ALSO
4b5b9a
 .BR Xvnc (1),
4b5b9a
 .BR vncpasswd (1),