Merge branch 'master' of https://github.com/madnicendio/tigervnc

12 files changed, 21 insertions, 21 deletions

diff --git a/unix/vncconfig/QueryConnectDialog.cxx b/unix/vncconfig/QueryConnectDialog.cxx
index aa1b78ad..a265356f 100644
--- a/unix/vncconfig/QueryConnectDialog.cxx
+++ b/unix/vncconfig/QueryConnectDialog.cxx
@@ -30,7 +30,7 @@ QueryConnectDialog::QueryConnectDialog(Display* dpy_,
                                        const char* user_,
                                        int timeout_,
                                        QueryResultCallback* cb)
-  : TXDialog(dpy_, 300, 100, "VNC Server : Accept Connection?"),
+  : TXDialog(dpy_, 300, 100, "VNC server : Accept connection?"),
     addressLbl(dpy, "Host:",this),
     address(dpy, address_, this),
     userLbl(dpy, "User:", this),
diff --git a/unix/vncconfig/vncconfig.cxx b/unix/vncconfig/vncconfig.cxx
index ecc6eddc..d74d18a6 100644
--- a/unix/vncconfig/vncconfig.cxx
+++ b/unix/vncconfig/vncconfig.cxx
@@ -112,7 +112,7 @@ public:
 
   void handleEvent(TXWindow* /*w*/, XEvent* ev) override {
     if (ev->type == vncExtEventBase + VncExtQueryConnectNotify) {
-       vlog.debug("query connection event");
+       vlog.debug("Query connection event");
        if (queryConnectDialog)
          delete queryConnectDialog;
        queryConnectDialog = nullptr;
diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in
index fdcce0e9..03eee275 100755
--- a/unix/vncserver/vncserver.in
+++ b/unix/vncserver/vncserver.in
@@ -238,7 +238,7 @@ close(XAUTH);
 
 $ENV{XAUTHORITY} = $xauthorityFile;
 
-# Now start the X VNC Server
+# Now start the X VNC server
 
 @cmd = ("xinit");
 
diff --git a/unix/vncserver/vncserver.users b/unix/vncserver/vncserver.users
index 0a63784c..c215acdc 100644
--- a/unix/vncserver/vncserver.users
+++ b/unix/vncserver/vncserver.users
@@ -1,4 +1,4 @@
-# TigerVNC User assignment
+# TigerVNC user assignment
 #
 # This file assigns users to specific VNC display numbers.
 # The syntax is <display>=<username>. E.g.:
diff --git a/unix/x0vncserver/Image.cxx b/unix/x0vncserver/Image.cxx
index c2026134..bd48c88d 100644
--- a/unix/x0vncserver/Image.cxx
+++ b/unix/x0vncserver/Image.cxx
@@ -80,7 +80,7 @@ void Image::Init(int width, int height)
   Visual* vis = DefaultVisual(dpy, DefaultScreen(dpy));
 
   if (vis->c_class != TrueColor) {
-    vlog.error("pseudocolour not supported");
+    vlog.error("Pseudocolour not supported");
     exit(1);
   }
 
@@ -251,7 +251,7 @@ void ShmImage::Init(int width, int height, const XVisualInfo *vinfo)
   }
 
   if (visual->c_class != TrueColor) {
-    vlog.error("pseudocolour not supported");
+    vlog.error("Pseudocolour not supported");
     exit(1);
   }
 
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index 40d84c03..b43e3f79 100644
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -70,7 +70,7 @@ BoolParameter rawKeyboard("RawKeyboard",
                           "avoid mapping them to the current keyboard "
                           "layout", false);
 IntParameter queryConnectTimeout("QueryConnectTimeout",
-                                 "Number of seconds to show the Accept Connection dialog before "
+                                 "Number of seconds to show the 'Accept connection' dialog before "
                                  "rejecting the connection",
                                  10);
 
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index 03f31576..f67bdcc9 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -251,7 +251,7 @@ char* programName;
 
 static void printVersion(FILE *fp)
 {
-  fprintf(fp, "TigerVNC Server version %s, built %s\n",
+  fprintf(fp, "TigerVNC server version %s, built %s\n",
           PACKAGE_VERSION, buildtime);
 }
 
diff --git a/unix/x0vncserver/x0vncserver.man b/unix/x0vncserver/x0vncserver.man
index 5bc8807a..ce4bd6a9 100644
--- a/unix/x0vncserver/x0vncserver.man
+++ b/unix/x0vncserver/x0vncserver.man
@@ -1,6 +1,6 @@
 .TH X0VNCSERVER 1 "" "TigerVNC" "TigerVNC Manual"
 .SH NAME
-x0vncserver \- TigerVNC Server for X displays
+x0vncserver \- TigerVNC server for X displays
 .SH SYNOPSIS
 .B x0vncserver
 .RI [ options ]
@@ -8,7 +8,7 @@ x0vncserver \- TigerVNC Server for X displays
 .B x0vncserver -version
 .SH DESCRIPTION
 .B x0vncserver
-is a TigerVNC Server which makes any X display remotely accessible via VNC,
+is a TigerVNC server which makes any X display remotely accessible via VNC,
 TigerVNC or compatible viewers.  Unlike \fBXvnc\fP(1), it does not create a
 virtual display.  Instead, it just shares an existing X server (typically,
 that one connected to the physical screen).
@@ -180,7 +180,7 @@ connections. Default is off.
 .
 .TP
 .B \-QueryConnectTimeout \fIseconds\fP
-Number of seconds to show the Accept Connection dialog before rejecting the
+Number of seconds to show the Accept connection dialog before rejecting the
 connection.  Default is \fB10\fP.
 .
 .TP
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index f0ab87ab..260ed3a6 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -67,7 +67,7 @@ BoolParameter rawKeyboard("RawKeyboard",
                           "layout", false);
 IntParameter queryConnectTimeout("QueryConnectTimeout",
                                  "Number of seconds to show the "
-                                 "Accept Connection dialog before "
+                                 "Accept connection dialog before "
                                  "rejecting the connection",
                                  10);
 
@@ -332,7 +332,7 @@ bool XserverDesktop::handleListenerEvent(int fd,
     return false;
 
   Socket* sock = (*i)->accept();
-  vlog.debug("new client, sock %d", sock->getFd());
+  vlog.debug("New client, sock %d", sock->getFd());
   sockserv->addSocket(sock);
   vncSetNotifyFd(sock->getFd(), screenIndex, true, false);
 
@@ -379,7 +379,7 @@ void XserverDesktop::blockHandler(int* timeout)
     for (i = sockets.begin(); i != sockets.end(); i++) {
       int fd = (*i)->getFd();
       if ((*i)->isShutdown()) {
-        vlog.debug("client gone, sock %d",fd);
+        vlog.debug("Client gone, sock %d",fd);
         vncRemoveNotifyFd(fd);
         server->removeSocket(*i);
         vncClientGone(fd);
@@ -412,14 +412,14 @@ void XserverDesktop::blockHandler(int* timeout)
 
 void XserverDesktop::addClient(Socket* sock, bool reverse, bool viewOnly)
 {
-  vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse);
+  vlog.debug("New client, sock %d reverse %d",sock->getFd(),reverse);
   server->addSocket(sock, reverse, viewOnly ? AccessView : AccessDefault);
   vncSetNotifyFd(sock->getFd(), screenIndex, true, false);
 }
 
 void XserverDesktop::disconnectClients()
 {
-  vlog.debug("disconnecting all clients");
+  vlog.debug("Disconnecting all clients");
   return server->closeClients("Disconnection from server end");
 }
 
diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man
index a5659e7d..49b1dc8a 100644
--- a/unix/xserver/hw/vnc/Xvnc.man
+++ b/unix/xserver/hw/vnc/Xvnc.man
@@ -278,7 +278,7 @@ QueryConnect to be supported.
 .
 .TP
 .B \-QueryConnectTimeout \fIseconds\fP
-Number of seconds to show the Accept Connection dialog before rejecting the
+Number of seconds to show the Accept connection dialog before rejecting the
 connection.  Default is \fB10\fP.
 .
 .TP
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index e56e0db0..9b8cfe5b 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -141,7 +141,7 @@ static PixelFormat vncGetPixelFormat(int scrIdx)
                      &redMask, &greenMask, &blueMask);
 
   if (!trueColour) {
-    vlog.error("pseudocolour not supported");
+    vlog.error("Pseudocolour not supported");
     abort();
   }
 
@@ -263,12 +263,12 @@ void vncExtensionInit(void)
                                           vncGetScreenHeight(),
                                           vncFbptr[scr],
                                           vncFbstride[scr]);
-        vlog.info("created VNC server for screen %d", scr);
+        vlog.info("Created VNC server for screen %d", scr);
 
         if (scr == 0 && vncInetdSock != -1 && listeners.empty()) {
           network::Socket* sock = new network::TcpSocket(vncInetdSock);
           desktop[scr]->addClient(sock, false, false);
-          vlog.info("added inetd sock");
+          vlog.info("Added inetd sock");
         }
       }
 
diff --git a/unix/xserver/hw/vnc/vncModule.c b/unix/xserver/hw/vnc/vncModule.c
index 68900804..5f0886a3 100644
--- a/unix/xserver/hw/vnc/vncModule.c
+++ b/unix/xserver/hw/vnc/vncModule.c
@@ -50,7 +50,7 @@ ExtensionModule vncExt =
 static XF86ModuleVersionInfo vncVersRec =
 {
     "vnc",
-    "TigerVNC Project",
+    "TigerVNC project",
     MODINFOSTRING1,
     MODINFOSTRING2,
     VENDOR_RELEASE,