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

4 files changed, 10 insertions, 10 deletions

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,