Merge remote branch 'upstream/master'

2010-07-29 11:21:21 +02:00
parent eb7b25ae17 0af07711ec
commit 045c117dbb
1 changed files with 2 additions and 0 deletions
@@ -79,6 +79,7 @@ There a few reasons why a proxy is required:
  server under Ubuntu you would do something like this:

    `sudo apt-get install tightvncserver`
+
    `vncserver :1`

    The VNC server will run in the background. The port that it runs
@@ -90,6 +91,7 @@ There a few reasons why a proxy is required:
  server will fight over the mouse.

    `sudo apt-get install x11vnc`
+
    `x11vnc -forever -display :0`

  Without the `-forever` option, x11vnc will exit after the first