Merge pull request #138 from stweil/master

Fix some typos

7 files changed, 10 insertions, 10 deletions

diff --git a/README b/README
index fc15824..6eba860 100644
--- a/README
+++ b/README
@@ -248,7 +248,7 @@ the original code from ORL/AT&T.
 
 When I began hacking with computers, my first interest was speed. So, when I
 got around assembler, I programmed the floppy to do much of the work, because
-it's clock rate was higher than that of my C64. This was my first experience
+its clock rate was higher than that of my C64. This was my first experience
 with client/server techniques.
 
 When I came around Xwindows (much later), I was at once intrigued by the
@@ -259,7 +259,7 @@ modem from home, it was no longer that much fun.
 When I started working with ASP (Application Service Provider) programs, I
 tumbled across Tarantella and Citrix. Being a security fanatic, the idea of
 running a server on windows didn't appeal to me, so Citrix went down the
-basket. However, Tarantella has it's own problems (security as well as the
+basket. However, Tarantella has its own problems (security as well as the
 high price). But at the same time somebody told me about this "great little
 administrator's tool" named VNC. Being used to windows programs' sizes, the
 surprise was reciprocal inverse to the size of VNC!
@@ -326,7 +326,7 @@ I am always amazed how people react whenever Microsoft(tm) puts in some
 features into their products which were around for a long time. Especially
 reporters seem to not know dick about what they are reporting about! But
 what is every time annoying again, is that they don't do it right. Every
-concept has it's new name (remember what enumerators used to be until
+concept has its new name (remember what enumerators used to be until
 Mickeysoft(tm) claimed that enumerators are what we thought were iterators.
 Yeah right, enumerators are also containers. They are not separated. Muddy.)
 
@@ -393,7 +393,7 @@ The people at AT&T worked really well to produce something as clean and lean
 as VNC. The managers decided that for their fame, they would release the
 program for free. But not only that! They realized that by releasing also
 the code for free, VNC would become an evolving little child, conquering
-new worlds, making it's parents very proud. As well they can be! To protect
+new worlds, making its parents very proud. As well they can be! To protect
 this innovation, they decided to make it GPL, not BSD. The principal
 difference is: You can make closed source programs deriving from BSD, not
 from GPL. You have to give proper credit with both.
diff --git a/common/zywrletemplate.c b/common/zywrletemplate.c
index faa7f07..bce4e36 100644
--- a/common/zywrletemplate.c
+++ b/common/zywrletemplate.c
@@ -352,7 +352,7 @@ static InlineX void Harr(signed char* pX0, signed char* pX1)
  In this method, H/L and X0/X1 is always same position.
  This lead us to more speed and less memory.
  Of cause, the result of both method is quite same
- because it's only difference that coefficient position.
+ because its only difference is that coefficient position.
 */
 static InlineX void WaveletLevel(int* data, int size, int l, int SkipPixel)
 {
diff --git a/examples/example.c b/examples/example.c
index 617e7ad..406378e 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -56,7 +56,7 @@ static void initBuffer(unsigned char* buffer)
   }
 }
 
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
 
 typedef struct ClientData {
   rfbBool oldButton;
diff --git a/examples/zippy.c b/examples/zippy.c
index 5a5961a..be06a28 100644
--- a/examples/zippy.c
+++ b/examples/zippy.c
@@ -7,7 +7,7 @@
 static int maxx=400, maxy=400, bpp=4;
 /* odd maxx doesn't work (vncviewer bug) */
 
-/* Here we create a structure so that every client has it's own pointer */
+/* Here we create a structure so that every client has its own pointer */
 
 /* turns the framebuffer black */
 void blank_framebuffer(char* frame_buffer, int x1, int y1, int x2, int y2);
diff --git a/libvncserver/main.c b/libvncserver/main.c
index a8458e4..47dac11 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -582,7 +582,7 @@ listenerRun(void *data)
     socklen_t len;
     fd_set listen_fds;  /* temp file descriptor list for select() */
 
-    /* TODO: this thread wont die by restarting the server */
+    /* TODO: this thread won't die by restarting the server */
     /* TODO: HTTP is not handled */
     while (1) {
         client_fd = -1;
diff --git a/webclients/novnc/include/display.js b/webclients/novnc/include/display.js
index a42b854..e255683 100644
--- a/webclients/novnc/include/display.js
+++ b/webclients/novnc/include/display.js
@@ -76,7 +76,7 @@ var Display;
         }
 
         if (this._prefer_js === null) {
-            Util.Info("Prefering javascript operations");
+            Util.Info("Preferring javascript operations");
             this._prefer_js = true;
         }
 
diff --git a/webclients/novnc/include/ui.js b/webclients/novnc/include/ui.js
index 4748ff0..50bbfcb 100644
--- a/webclients/novnc/include/ui.js
+++ b/webclients/novnc/include/ui.js
@@ -883,7 +883,7 @@ var UI;
             $D('showKeyboard').className = "noVNC_status_button";
             //Weird bug in iOS if you change keyboardVisible
             //here it does not actually occur so next time
-            //you click keyboard icon it doesnt work.
+            //you click keyboard icon it doesn't work.
             UI.hideKeyboardTimeout = setTimeout(function() { UI.setKeyboard(); },100);
         },