[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.9-2-gaedeaf1

X2Go dev team git-admin at x2go.org
Wed Dec 4 06:21:55 CET 2013


The branch, build-baikal has been updated
       via  aedeaf1bff3743d4ee373857feed28c5c60d9f24 (commit)
      from  67d66c597240cd2a88c29142556acc4baada0f6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 INSTALL                                            |   10 ++--
 debian/changelog                                   |   14 ++---
 debian/control                                     |   58 ++++++++++----------
 debian/copyright                                   |    2 +-
 debian/x2goserver-printing.postinst                |    2 +-
 debian/x2goserver.init                             |    2 +-
 debian/x2goserver.postinst                         |    2 +-
 x2goserver-compat/bin/x2gosuspend                  |    2 +-
 x2goserver-compat/bin/x2gosuspend-agent            |    2 +-
 x2goserver-compat/bin/x2goterminate                |    2 +-
 x2goserver-compat/man/man8/x2gosuspend-agent.8     |    8 +--
 x2goserver-compat/man/man8/x2gosuspend.8           |    8 +--
 x2goserver-compat/man/man8/x2goterminate.8         |    8 +--
 .../share/x2gofeature.d/x2goserver-compat.features |    4 +-
 .../bin/x2goserver-run-extensions                  |    2 +-
 .../man/man8/x2goserver-run-extensions.8           |   22 ++++----
 .../x2gofeature.d/x2goserver-extensions.features   |    4 +-
 x2goserver-printing/bin/x2goprint                  |    8 +--
 x2goserver-printing/man/man8/x2goprint.8           |   28 +++++-----
 .../x2gofeature.d/x2goserver-printing.features     |    4 +-
 x2goserver-pyhoca/bin/x2gosetkeyboard              |    4 +-
 x2goserver-pyhoca/man/man8/x2gosetkeyboard.8       |   12 ++--
 .../share/x2gofeature.d/x2goserver-pyhoca.features |    4 +-
 x2goserver-xsession/etc/Xsession                   |    2 +-
 .../x2gofeature.d/x2goserver-xsession.features     |    4 +-
 x2goserver/bin/x2gobasepath                        |    2 +-
 x2goserver/bin/x2gocmdexitmessage                  |    2 +-
 x2goserver/bin/x2gofeature                         |    4 +-
 x2goserver/bin/x2gogetservers                      |    2 +-
 x2goserver/bin/x2golistdesktops                    |    2 +-
 x2goserver/bin/x2golistmounts                      |    2 +-
 x2goserver/bin/x2golistsessions                    |    2 +-
 x2goserver/bin/x2gomountdirs                       |    2 +-
 x2goserver/bin/x2goresume-session                  |    2 +-
 x2goserver/bin/x2goruncommand                      |    2 +-
 x2goserver/bin/x2gosessionlimit                    |    2 +-
 x2goserver/bin/x2goshowblocks                      |    2 +-
 x2goserver/bin/x2gostartagent                      |    6 +-
 x2goserver/bin/x2gosuspend-session                 |    2 +-
 x2goserver/bin/x2goterminate-session               |    2 +-
 x2goserver/bin/x2goumount-session                  |    2 +-
 x2goserver/bin/x2goversion                         |    4 +-
 x2goserver/lib/x2gochangestatus                    |    2 +-
 x2goserver/lib/x2gocreatesession                   |    2 +-
 x2goserver/lib/x2godbwrapper.pm                    |    2 +-
 x2goserver/lib/x2gogetagent                        |    2 +-
 x2goserver/lib/x2gogetdisplays                     |    2 +-
 x2goserver/lib/x2gogetports                        |    2 +-
 x2goserver/lib/x2goinsertport                      |    2 +-
 x2goserver/lib/x2goinsertsession                   |    2 +-
 x2goserver/lib/x2golistsessions_sql                |    4 +-
 x2goserver/lib/x2gologlevel                        |    2 +-
 x2goserver/lib/x2gologlevel.pm                     |    2 +-
 x2goserver/lib/x2goresume                          |    2 +-
 x2goserver/lib/x2gosqlitewrapper.pl                |    2 +-
 x2goserver/lib/x2gosuspend-agent                   |    2 +-
 x2goserver/lib/x2gosyslog                          |    2 +-
 x2goserver/man/man8/x2gobasepath.8                 |    8 +--
 x2goserver/man/man8/x2gocleansessions.8            |    8 +--
 x2goserver/man/man8/x2gocmdexitmessage.8           |    8 +--
 x2goserver/man/man8/x2godbadmin.8                  |   10 ++--
 x2goserver/man/man8/x2gofeature.8                  |    8 +--
 x2goserver/man/man8/x2golistdesktops.8             |   10 ++--
 x2goserver/man/man8/x2golistmounts.8               |   10 ++--
 x2goserver/man/man8/x2golistsessions.8             |   18 +++---
 x2goserver/man/man8/x2golistsessions_root.8        |    8 +--
 x2goserver/man/man8/x2gomountdirs.8                |   18 +++---
 x2goserver/man/man8/x2goresume-session.8           |   10 ++--
 x2goserver/man/man8/x2goruncommand.8               |   12 ++--
 x2goserver/man/man8/x2gosessionlimit.8             |    4 +-
 x2goserver/man/man8/x2goshowblocks.8               |    6 +-
 x2goserver/man/man8/x2gostartagent.8               |   18 +++---
 x2goserver/man/man8/x2gosuspend-session.8          |   10 ++--
 x2goserver/man/man8/x2goterminate-session.8        |    8 +--
 x2goserver/man/man8/x2goumount-session.8           |   16 +++---
 x2goserver/man/man8/x2goversion.8                  |   18 +++---
 x2goserver/sbin/x2gocleansessions                  |    2 +-
 x2goserver/sbin/x2godbadmin                        |    2 +-
 x2goserver/sbin/x2golistsessions_root              |    2 +-
 x2goserver/share/x2gofeature.d/x2goserver.features |    4 +-
 x2goserver/x2gosqlitewrapper.c                     |    2 +-
 81 files changed, 256 insertions(+), 256 deletions(-)

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index eeac765..4bbf432 100644
--- a/INSTALL
+++ b/INSTALL
@@ -65,7 +65,7 @@ have to be members of your server system's ,,fuse'' group
 Also users that shall be able to send print jobs to client-side printers have to be
 members of the server-side ,,fuse'' group (see above).
 
-As X2go printing setups can be rather versatile, details on X2go printing are explained in 
+As X2Go printing setups can be rather versatile, details on X2Go printing are explained in 
 the project's wiki:
 http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu
 
@@ -78,11 +78,11 @@ http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu
 
 7a.) DEFAULT: SQLite setup
 --------------------------
-This variant is the default X2go database setup. The X2go database keeps track of
-running/suspended/finished X2go sessions, mounted devices, etc. If you use SQLite
-as DB backend, X2go will run on one single server.
+This variant is the default X2Go database setup. The X2Go database keeps track of
+running/suspended/finished X2Go sessions, mounted devices, etc. If you use SQLite
+as DB backend, X2Go will run on one single server.
 
-For multi-X2goServer support use the PostgreSQL setup variant of X2go server. All files
+For multi-X2goServer support use the PostgreSQL setup variant of X2Go server. All files
 should be present for this setup. If not, please report it as a bug.
 
 
diff --git a/debian/changelog b/debian/changelog
index aec1bf3..31ec83f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
 
   [ Mike Gabriel ]
   * New upstream version (3.0.99.10):
-    - Continue development...
+    - Replace all string ,,X2Go.' with ,,X2Go''.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 18 Jan 2012 14:43:21 +0100
 
@@ -58,7 +58,7 @@ x2goserver (3.0.99.7-0~x2go1) unstable; urgency=low
   * New upstream version (3.0.99.7):
     - Move x2golistmounts script from x2goserver-extensions to x2goserver
       core.
-    - X2go server extensions: fix regular expression when scanning modality dirs.
+    - X2Go server extensions: fix regular expression when scanning modality dirs.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 26 Oct 2011 13:04:54 +0200
 
@@ -107,7 +107,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low
     - Present an ISO-8601 compliant datetime string in session lists
       rendered by x2golistsessions (and similar) command(s).
     - Silence knotify SIGHUP signals in case that no knotify is running in the
-      X2go session.
+      X2Go session.
     - Fix x2goumount-session for individual paths (folder type: disk),
       ToDo: folder type CDROM and removable media.
     - Let db_insertmount create a proper return value (success vs. failed).
@@ -118,7 +118,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low
     - Identified x2goumount script (x2goserver-compat) as a necessary
       component of x2gognomebindings and moved it there (with new name:
       x2goumount-session-gnome).
-    - Add x2golistmounts script to X2go server extensions.
+    - Add x2golistmounts script to X2Go server extensions.
     - Add x2gofeature script and x2gofeature.d subscripts.
     - Add x2gofeature man page.
     - Move x2goversion script into x2goserver core.
@@ -133,7 +133,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low
       x2goterminate-session or when x2goruncommand is about to exit.
     - Resume/suspend x2godesktopsharing during x2goresume-session,
       x2gosuspend-session.
-    - Provide pluggable X2go extension system for main X2go server
+    - Provide pluggable X2Go extension system for main X2Go server
       functions.
     - Provide man page for x2goserver-run-extensions that explains the new plug-in
       mechanism of x2goserver.
@@ -155,7 +155,7 @@ x2goserver (3.0.99.6-0~x2go1) unstable; urgency=low
 
   [ Moritz Strübe ]
   * Improvements for new upstream version (3.0.99.6):
-    - Make digits at the beginning of X2go server extension scripts a must, not a
+    - Make digits at the beginning of X2Go server extension scripts a must, not a
       suggestion.
 
   [ Ivan Kabaivanov ]
@@ -186,7 +186,7 @@ x2goserver (3.0.99.5-0~x2go2) unstable; urgency=low
 x2goserver (3.0.99.5-0~x2go1) unstable; urgency=low
 
   * adds x2goprint to x2goserver package
-  * implements X2go MIME Box feature
+  * implements X2Go MIME Box feature
   * fixes installation conflicts with x2goserver-one, x2goserver-home
     and x2goprint
   * change of version numbering scheme
diff --git a/debian/control b/debian/control
index 89dc5b2..059bdc2 100644
--- a/debian/control
+++ b/debian/control
@@ -49,8 +49,8 @@ Breaks:
 Replaces:
  x2goserver-one,
  x2goserver-home,
-Description: X2go server daemon scripts
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -59,14 +59,14 @@ Description: X2go server daemon scripts
     - authentication by smartcard and USB stick
  .
  This package contains the main daemon and tools for
- X2go server-side session administrations.
+ X2Go server-side session administrations.
  .
  The x2goserver package provides full functionality
- for running the X2go project's legacy X2go client
+ for running the X2Go project's legacy X2Go client
  (x2goclient) on the client-side.
  .
  However, if you intend using other client implementations 
- of X2go make sure that you also have X2go server
+ of X2Go make sure that you also have X2Go server
  extensions package (x2goserver-extensions) installed.
 
 Package: x2goserver-printing
@@ -81,8 +81,8 @@ Replaces:
  x2goprint
 Suggests:
  cups-x2go
-Description: X2go server daemon scripts (printing)
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts (printing)
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -90,17 +90,17 @@ Description: X2go server daemon scripts (printing)
     - audio support
     - authentication by smartcard and USB stick
  .
- The X2go server printing package provides
+ The X2Go server printing package provides
  client-side printing support for X2go.
  .
- This package has to be installed on X2go servers
- that shall be able to pass X2go print jobs on
- to the X2go client.
+ This package has to be installed on X2Go servers
+ that shall be able to pass X2Go print jobs on
+ to the X2Go client.
  .
  This package co-operates with the cups-x2go CUPS
- backend. If CUPS server and X2go server are hosted
+ backend. If CUPS server and X2Go server are hosted
  on different machines, then make sure you install
- this package on the X2go server/s (and the cups-x2go
+ this package on the X2Go server/s (and the cups-x2go
  package on the CUPS server).
 
 Package: x2goserver-compat
@@ -108,8 +108,8 @@ Architecture: all
 Depends:
  ${misc:Depends},
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~)
-Description: X2go server daemon scripts (backwards compatitbity to old client versions)
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts (backwards compatitbity to old client versions)
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -118,7 +118,7 @@ Description: X2go server daemon scripts (backwards compatitbity to old client ve
     - authentication by smartcard and USB stick
  .
  This package contains compatitbility scripts to allow
- old x2goclient versions to connect to your X2go server.
+ old x2goclient versions to connect to your X2Go server.
 
 Package: x2goserver-extensions
 Architecture: all
@@ -126,8 +126,8 @@ Depends:
  ${misc:Depends},
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  x11-xkb-utils
-Description: X2go server daemon scripts (extensions)
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts (extensions)
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -135,12 +135,12 @@ Description: X2go server daemon scripts (extensions)
     - audio support
     - authentication by smartcard and USB stick
  .
- The X2go server extension namespace offers contributors
- to add script functionality to X2go that is not
- needed/ignored by the legacy X2go client (x2goclient).
+ The X2Go server extension namespace offers contributors
+ to add script functionality to X2Go that is not
+ needed/ignored by the legacy X2Go client (x2goclient).
  .
  Make sure you have this package installed on your server
- if you want non-legacy X2go clients to be able to
+ if you want non-legacy X2Go clients to be able to
  access your server without lack of features.
 
 Package: x2goserver-xsession
@@ -149,8 +149,8 @@ Depends:
  ${misc:Depends},
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
  x11-common
-Description: X2go server daemon scripts (Xsession runner)
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts (Xsession runner)
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -158,21 +158,21 @@ Description: X2go server daemon scripts (Xsession runner)
     - audio support
     - authentication by smartcard and USB stick
  .
- This X2go server add-on enables Xsession script handling
+ This X2Go server add-on enables Xsession script handling
  when starting desktop sessions with X2go.
  .
  Amongst others the parsing of Xsession scripts will
  enable desktop-profiles, ssh-agent startups, gpgagent
  startups and many more Xsession related features on 
- X2go session login automagically.
+ X2Go session login automagically.
 
 Package: x2goserver-pyhoca
 Architecture: all
 Depends:
  ${misc:Depends},
  x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~),
-Description: X2go server daemon scripts (add-ons for pyhoca client)
- X2go is a server based computing environment with
+Description: X2Go server daemon scripts (add-ons for pyhoca client)
+ X2Go is a server based computing environment with
     - session resuming
     - low bandwith support
     - LDAP support
@@ -180,7 +180,7 @@ Description: X2go server daemon scripts (add-ons for pyhoca client)
     - audio support
     - authentication by smartcard and USB stick
  .
- This X2go server add-on adds extra functionality when using
+ This X2Go server add-on adds extra functionality when using
  the pyhoca client (GUI or cmdline tool). The installation
  of this package is completely optional, the pyhoca client
  will work without.
diff --git a/debian/copyright b/debian/copyright
index 23cc85f..ad32b1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream Authors:
  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
  Heinz-M. Graesing <heinz-m.graesing at obviously-nice.de>
 
-Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
index 7c1451c..b17c55e 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -21,7 +21,7 @@ set -e
 case "$1" in
 	configure)
 		###
-		### X2go printing
+		### X2Go printing
 		###
 
 		# setup x2goprint user and x2goprint group
diff --git a/debian/x2goserver.init b/debian/x2goserver.init
index b553c3a..be3631c 100644
--- a/debian/x2goserver.init
+++ b/debian/x2goserver.init
@@ -5,7 +5,7 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start and stop the X2go daemon
+# Short-Description: Start and stop the X2Go daemon
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 9d5d3bb..b84f7db 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -26,7 +26,7 @@ case "$1" in
 		chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
 
 		###
-		### X2go session DB management
+		### X2Go session DB management
 		###
 
 		# setup x2gouser and group
diff --git a/x2goserver-compat/bin/x2gosuspend b/x2goserver-compat/bin/x2gosuspend
index 4ddd3df..8dd489c 100755
--- a/x2goserver-compat/bin/x2gosuspend
+++ b/x2goserver-compat/bin/x2gosuspend
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver-compat/bin/x2gosuspend-agent b/x2goserver-compat/bin/x2gosuspend-agent
index 9ca6d4f..90d3973 100755
--- a/x2goserver-compat/bin/x2gosuspend-agent
+++ b/x2goserver-compat/bin/x2gosuspend-agent
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver-compat/bin/x2goterminate b/x2goserver-compat/bin/x2goterminate
index 125d228..7f6fcba 100755
--- a/x2goserver-compat/bin/x2goterminate
+++ b/x2goserver-compat/bin/x2goterminate
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8
index e6e8116..4eb6564 100644
--- a/x2goserver-compat/man/man8/x2gosuspend-agent.8
+++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility with old clients)
+x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility w
 x2gosuspend-agent <session-name>
 
 .SH DESCRIPTION
-\fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script
+\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script
 is required to allow session suspending for old \fBx2goclient\fR versions.
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8
index af119ee..ebb0cac 100644
--- a/x2goserver-compat/man/man8/x2gosuspend.8
+++ b/x2goserver-compat/man/man8/x2gosuspend.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients)
+x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with ol
 x2gosuspend <session-name>
 
 .SH DESCRIPTION
-\fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script
+\fBx2gosuspend\fR is a deprecated script belonging to X2Go Server. The availability of this script
 is required to allow session suspending for old \fBx2goclient\fR versions.
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8
index 68fc016..8e170a0 100644
--- a/x2goserver-compat/man/man8/x2goterminate.8
+++ b/x2goserver-compat/man/man8/x2goterminate.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goterminate 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goterminate 1 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goterminate \- X2go Server Script (deprecated, shipped for compatibility with old clients)
+x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2goterminate \- X2go Server Script (deprecated, shipped for compatibility with
 x2goterminate <session-name>
 
 .SH DESCRIPTION
-\fBx2goterminate\fR is a deprecated script belonging to X2go Server. The availability of this script
+\fBx2goterminate\fR is a deprecated script belonging to X2Go Server. The availability of this script
 is required to allow session termination from old \fBx2goclient\fR versions.
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
index 030aa6e..5f3f5b0 100755
--- a/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
+++ b/x2goserver-compat/share/x2gofeature.d/x2goserver-compat.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_COMPAT_SCRIPTS") echo "ok"; exit 0;;
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index 3a640a2..2cb3c4d 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
index 2a5ad19..c0fb50b 100644
--- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
+++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goserver-run-extensions \- Run X2go Server Extensions
+x2goserver-run-extensions \- Run X2Go Server Extensions
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,15 +15,15 @@ x2goserver-run-extensions \- Run X2go Server Extensions
 x2goserver-run-extensions <session_id> <modality>
 
 .SH DESCRIPTION
-\fBx2goserver-run-extensions\fR is called from within a number of X2go Server core scripts.
+\fBx2goserver-run-extensions\fR is called from within a number of X2Go Server core scripts.
 .PP
 \fIWARNING:\fR Do not call it directly unless you really know what you are doing.
 .PP
 \fBx2goserver-run-extensions\fR executes scripts that have been
-provided by third-party X2go extension packages.
+provided by third-party X2Go extension packages.
 .PP
-What this man page is about is not the script usage itself but the way of how to provide X2go server
-extensions and features without the need to change the core X2go server scripts.
+What this man page is about is not the script usage itself but the way of how to provide X2Go server
+extensions and features without the need to change the core X2Go server scripts.
 .SH MODALITIES
 \fBx2goserver-run-extensions\fR is called with user privileges, as first cmd line argument the session ID is provided
 as the second cmd line argument a (what we call it) modality is provided.
@@ -31,7 +31,7 @@ as the second cmd line argument a (what we call it) modality is provided.
 This modality tells \fBx2goserver-run-extensions\fR at what stage of an X2go
 session startup, resumption, suspension or termination the calling script currently is at.
 .PP
-Calling X2go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR,
+Calling X2Go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR,
 \fBx2gosuspend-session(8)\fR or \fBx2goterminate-session(8)\fR.
 .PP
 The modality names all refer to a sub-directory of the path:
@@ -40,7 +40,7 @@ The modality names all refer to a sub-directory of the path:
 
 where <INSTALL_PREFIX> mostly is /usr on commonly-used GNU/Linux systems.
 .PP
-In any of these sub-directories third-party X2go extension packages can place scripts or binaries that will then get executed by the core X2go server
+In any of these sub-directories third-party X2Go extension packages can place scripts or binaries that will then get executed by the core X2Go server
 commands, either before or after the essential functionality (e.g. x2goagent startup, x2goagent suspension, x2goagent resumption, etc.) or on failure of that
 essential functionality.
 .PP
@@ -65,13 +65,13 @@ The following table shows the available modalities, the calling scripts and the
                        post-terminate    extensions/post-terminate.d/
                        fail-terminate    extensions/fail-terminate.d/
 
-\fIIMPORTANT:\fR When providing X2go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place
+\fIIMPORTANT:\fR When providing X2Go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place
 in either of the above folders do under no circumstance fail during execution. Return codes are ignored and failures are therefore not (yet) propagated.
 .SH EXECUTION OF EXTENSIONS
 Scripts (or binaries) that have been placed into one of the pre/post/fail modality folders (see above) are executed in alpha-numerical sorting order.
 .PP
 Extensions will only get executed if their file names start with three digits.
-This restriction is there to make sure that X2go Server extensions get executed in the correct/wanted order:
+This restriction is there to make sure that X2Go Server extensions get executed in the correct/wanted order:
 .PP
 For example:
   010_x2goserver-statistics
@@ -83,5 +83,5 @@ As exitcode \fBx2goserver-run-extensions\fR always returns 0 and pretends to be
 .SH SEE ALSO
 \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, \fBx2gosuspend-session(8)\fR and \fBx2goterminate-session(8)\fR.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
index 509e5a4..23167f8 100755
--- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
+++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_RUN_EXTENSIONS") echo "ok"; exit 0;;
diff --git a/x2goserver-printing/bin/x2goprint b/x2goserver-printing/bin/x2goprint
index 480c583..b53c373 100755
--- a/x2goserver-printing/bin/x2goprint
+++ b/x2goserver-printing/bin/x2goprint
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -109,7 +109,7 @@ if ( $mounts=~m/$spooldir/)
 	# we will copy the print files from the temp location above to
 	# the SSHFS share mounted from the client system.
 
-	syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2go client system");
+	syslog('info', "client-side spool dir is mounted, transferring printable file $pdfFile to X2Go client system");
 
 	if (not move("$printdir/$pdfFile", "$spooltmp")) {
 		syslog('err', "ERROR: x2goprint failed to process print spool job for file $pdfFile");
@@ -118,7 +118,7 @@ if ( $mounts=~m/$spooldir/)
 	chown $uid, $gid, "$spooltmp/$pdfFile";
 
 	system("su $user -c \"mv $spooltmp/$pdfFile $spooldir\"");
-	syslog('debug', "x2goprint moved file $pdfFile to X2go client's spool dir");
+	syslog('debug', "x2goprint moved file $pdfFile to X2Go client's spool dir");
 
 	open (RFILE,">$spooltmp/$pdfFile.ready");
 	print RFILE "$pdfFile\n$title";
@@ -126,7 +126,7 @@ if ( $mounts=~m/$spooldir/)
 
 	chown $uid, $gid, "$spooltmp/$pdfFile.ready";
 	system ("su $user -c \"mv $spooltmp/$pdfFile.ready $spooldir\"");
-	syslog('debug', "x2goprint moved file $pdfFile.ready to X2go client's spool dir, X2go client should start the print dialog very soon");
+	syslog('debug', "x2goprint moved file $pdfFile.ready to X2Go client's spool dir, X2Go client should start the print dialog very soon");
 
 } else {
 
diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8
index 1075652..11a5e0a 100644
--- a/x2goserver-printing/man/man8/x2goprint.8
+++ b/x2goserver-printing/man/man8/x2goprint.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goprint 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goprint 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goprint \- Process X2go Print Job
+x2goprint \- Process X2Go Print Job
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,15 +15,15 @@ x2goprint \- Process X2go Print Job
 x2goprint <username> <session_id> <pdf_file> <title_file>
 
 .SH DESCRIPTION
-X2go print jobs are rendered by the \fBcups-x2go\fR backend on your network's (central) CUPS server and
-then get copied to the X2go server that the X2go print job was issued from.
+X2Go print jobs are rendered by the \fBcups-x2go\fR backend on your network's (central) CUPS server and
+then get copied to the X2Go server that the X2Go print job was issued from.
 .PP
-On that X2go server \fBcups-x2go\fR places two print job files (a PDF file and a title file)
+On that X2Go server \fBcups-x2go\fR places two print job files (a PDF file and a title file)
 into the home directory of the POSIX system user ,,x2goprint'' where they await further processing
 by \fBx2goprint\fR.
 .PP
-The \fBx2goprint\fR command on the session's X2go server (executed by \fBcups-x2go\fR backend) then
-prepares the job files for delivery to the X2go client-side.
+The \fBx2goprint\fR command on the session's X2Go server (executed by \fBcups-x2go\fR backend) then
+prepares the job files for delivery to the X2Go client-side.
 .PP
 \fBx2goprint\fR must run with root privileges and is executed by \fBcups-x2go\fR.
 .SH ARGUMENTS
@@ -32,7 +32,7 @@ prepares the job files for delivery to the X2go client-side.
 The owner of the incoming print jobs is given as the <username> argument.
 .TP
 \*(T<\fB\<session_id>\fR\*(T>
-The <session_id> is the unique identifier of the X2go session that the processed print job is
+The <session_id> is the unique identifier of the X2Go session that the processed print job is
 coming from.
 .TP
 \*(T<\fB\<pdf_file>\fR\*(T>
@@ -42,14 +42,14 @@ The filename of the PDF file as dropped into ~x2goprint by \fBcups-x2go\fR.
 The filename of the title file as dropped into ~x2goprint by \fBcups-x2go\fR.
 .PP
 .SH PERMISSIONS
-X2go uses the fuse-based SSH filesystem (SSHFS) for transferring print jobs from X2go server to X2go client.
-Users that shall use X2go printing must be members of the X2go server's ,,fuse'' POSIX group.
+X2Go uses the fuse-based SSH filesystem (SSHFS) for transferring print jobs from X2Go server to X2Go client.
+Users that shall use X2Go printing must be members of the X2Go server's ,,fuse'' POSIX group.
 .PP
 .SH X2GO CLUSTER MODE
-If X2go server and CUPS server are the same machine, no further setup for X2go printing is necessary.
+If X2Go server and CUPS server are the same machine, no further setup for X2Go printing is necessary.
 .PP
-However, if X2go server and CUPS server are hosted on separate machines then a special setup of sudo and SSH
-is required on X2go server(s) and the central CUPS server.
+However, if X2Go server and CUPS server are hosted on separate machines then a special setup of sudo and SSH
+is required on X2Go server(s) and the central CUPS server.
 .PP
 Refer to http://wiki.x2go.org/installing_x2go_printing_debian_ubuntu for further information.
 .PP
@@ -60,5 +60,5 @@ If \fBx2goprint\fR has run successfully, an exitcode of 0 is returned. If the sc
 called by a non-root user or with the wrong number of command line arguments, a non-zero exitcode is
 returned.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
index 7332656..8b0be89 100755
--- a/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
+++ b/x2goserver-printing/share/x2gofeature.d/x2goserver-printing.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_PRINTING") echo "ok"; exit 0;;
diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard
index 4073fa9..6b00e88 100755
--- a/x2goserver-pyhoca/bin/x2gosetkeyboard
+++ b/x2goserver-pyhoca/bin/x2gosetkeyboard
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
 
 read_keyboard_file() {
 
-	# retrieve keyboard settings from keyboard file in X2go session dir
+	# retrieve keyboard settings from keyboard file in X2Go session dir
 	XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
 	XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE}  | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
 	XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
diff --git a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
index e77ee77..77c5055 100644
--- a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
+++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)"
 .SH NAME
-x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client
+x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,10 +15,10 @@ x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Cli
 x2gosetkeyboard
 
 .SH DESCRIPTION
-\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects
-the X2go session keyboard settings requested from the client side.
+\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2Go session directory and introspects
+the X2Go session keyboard settings requested from the client side.
 .PP
-If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error
+If no 'keyboard' file is present in the X2Go session directory, nothing happens (i.e. no error
 will be raised).
 .SH RETURN VALUES
 If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is
@@ -30,5 +30,5 @@ If the command fails on its way, then the exitcode of the failing command is ret
 ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
index eb0dce4..e9a3080 100755
--- a/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
+++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index bda13bd..c241b41 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -2,7 +2,7 @@
 #
 # /etc/x2go/Xsession
 #
-# X2go Xsession file -- used by x2goserver Xsession.d add-on.
+# X2Go Xsession file -- used by x2goserver Xsession.d add-on.
 
 # This file has been derived from the global Xsession file in Debian squeeze
 
diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features
index 9fb329e..4850483 100755
--- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features
+++ b/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_XSESSION") echo "ok"; exit 0;;
diff --git a/x2goserver/bin/x2gobasepath b/x2goserver/bin/x2gobasepath
index 1716538..7a1adf1 100755
--- a/x2goserver/bin/x2gobasepath
+++ b/x2goserver/bin/x2gobasepath
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index 8c96e92..f5b9fab 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature
index 6bb7d6a..adf85e6 100755
--- a/x2goserver/bin/x2gofeature
+++ b/x2goserver/bin/x2gofeature
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# run x2gofeature scripts of X2go extensions
+# run x2gofeature scripts of X2Go extensions
 test -d $X2GO_SHARE_PATH/x2gofeature.d && {
     for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
         $subscript $@ && exit 0
diff --git a/x2goserver/bin/x2gogetservers b/x2goserver/bin/x2gogetservers
index 6d501a4..da7d048 100755
--- a/x2goserver/bin/x2gogetservers
+++ b/x2goserver/bin/x2gogetservers
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2golistdesktops b/x2goserver/bin/x2golistdesktops
index 743d23d..814e0a9 100755
--- a/x2goserver/bin/x2golistdesktops
+++ b/x2goserver/bin/x2golistdesktops
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2golistmounts b/x2goserver/bin/x2golistmounts
index 561c554..4a7671f 100755
--- a/x2goserver/bin/x2golistmounts
+++ b/x2goserver/bin/x2golistmounts
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 080aa94..847355e 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 203eb06..e1cdd5e 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 7ad09f4..95aae49 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index b24d2f2..bb08016 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 073d0c0..a32b6eb 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goshowblocks b/x2goserver/bin/x2goshowblocks
index d762645..3b8171a 100755
--- a/x2goserver/bin/x2goshowblocks
+++ b/x2goserver/bin/x2goshowblocks
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 2af8749..a5a4310 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -248,13 +248,13 @@ fi
 X2GO_AGENT_PID=$!
 X2GO_AGENT_RETVAL=$?
 test $X2GO_AGENT_RETVAL && {
-	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2go agent session with ID $SESSION_NAME"
+	$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2Go agent session with ID $SESSION_NAME"
 
 	# run x2goserver-extensions for post-start
 	x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-start || true
 
 } || {
-	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2go agent session with ID $SESSION_NAME"
+	$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2Go agent session with ID $SESSION_NAME"
 
 	# run x2goserver-extensions for fail-start
 	x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-start || true
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index ffc19f9..df276b6 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index d07b9c0..53bd90c 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 971c689..8c93bf9 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion
index ecc11d1..ff4c861 100755
--- a/x2goserver/bin/x2goversion
+++ b/x2goserver/bin/x2goversion
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ if [ -n "$1" ]; then
 	if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then
 		echo "$(get_version ${X2GO_COMPONENT_VERFILE})"
 	else
-		echo "Version information for X2go component '$X2GO_COMPONENT' is not available." >&1
+		echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1
 	fi
 else
 	cd ${X2GO_VERSIONS_BASEPATH}
diff --git a/x2goserver/lib/x2gochangestatus b/x2goserver/lib/x2gochangestatus
index 5b75400..a6c2182 100755
--- a/x2goserver/lib/x2gochangestatus
+++ b/x2goserver/lib/x2gochangestatus
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gocreatesession b/x2goserver/lib/x2gocreatesession
index 92a3cdc..1b3f362 100755
--- a/x2goserver/lib/x2gocreatesession
+++ b/x2goserver/lib/x2gocreatesession
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm
index 92e4549..266fac1 100644
--- a/x2goserver/lib/x2godbwrapper.pm
+++ b/x2goserver/lib/x2godbwrapper.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gogetagent b/x2goserver/lib/x2gogetagent
index 66b49df..1d8b35a 100755
--- a/x2goserver/lib/x2gogetagent
+++ b/x2goserver/lib/x2gogetagent
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gogetdisplays b/x2goserver/lib/x2gogetdisplays
index 3ce65b9..72e124c 100755
--- a/x2goserver/lib/x2gogetdisplays
+++ b/x2goserver/lib/x2gogetdisplays
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gogetports b/x2goserver/lib/x2gogetports
index 6a637a2..d58f5dd 100755
--- a/x2goserver/lib/x2gogetports
+++ b/x2goserver/lib/x2gogetports
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2goinsertport b/x2goserver/lib/x2goinsertport
index d1994e1..db3598b 100755
--- a/x2goserver/lib/x2goinsertport
+++ b/x2goserver/lib/x2goinsertport
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2goinsertsession b/x2goserver/lib/x2goinsertsession
index 553af07..2d29248 100755
--- a/x2goserver/lib/x2goinsertsession
+++ b/x2goserver/lib/x2goinsertsession
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2golistsessions_sql b/x2goserver/lib/x2golistsessions_sql
index bde7a25..ce83544 100755
--- a/x2goserver/lib/x2golistsessions_sql
+++ b/x2goserver/lib/x2golistsessions_sql
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ for ( $i=0;$i<@array;$i++)
 	{
 		my $sid = @ln[1];
 		dbsys_rmsessionsroot($sid);
-		syslog('debug', "Purging finished session from X2go db, session ID: $sid");
+		syslog('debug', "Purging finished session from X2Go db, session ID: $sid");
 	}
 	print "@array[$i]\n";
 }
diff --git a/x2goserver/lib/x2gologlevel b/x2goserver/lib/x2gologlevel
index 945f84e..f1b4c00 100755
--- a/x2goserver/lib/x2gologlevel
+++ b/x2goserver/lib/x2gologlevel
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gologlevel.pm b/x2goserver/lib/x2gologlevel.pm
index b6df771..0d8fefd 100644
--- a/x2goserver/lib/x2gologlevel.pm
+++ b/x2goserver/lib/x2gologlevel.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2goresume b/x2goserver/lib/x2goresume
index 028e34f..c577474 100755
--- a/x2goserver/lib/x2goresume
+++ b/x2goserver/lib/x2goresume
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl
index c7ba72b..6c1e74e 100755
--- a/x2goserver/lib/x2gosqlitewrapper.pl
+++ b/x2goserver/lib/x2gosqlitewrapper.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gosuspend-agent b/x2goserver/lib/x2gosuspend-agent
index 1873fac..f1922fe 100755
--- a/x2goserver/lib/x2gosuspend-agent
+++ b/x2goserver/lib/x2gosuspend-agent
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/lib/x2gosyslog b/x2goserver/lib/x2gosyslog
index a4d70d0..e4b13a7 100755
--- a/x2goserver/lib/x2gosyslog
+++ b/x2goserver/lib/x2gosyslog
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8
index 01a9fd3..e2dde5c 100644
--- a/x2goserver/man/man8/x2gobasepath.8
+++ b/x2goserver/man/man8/x2gobasepath.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gobasepath 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2gobasepath 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
-x2gobasepath \- Detect Base Path of X2go Server Installation
+x2gobasepath \- Detect Base Path of X2Go Server Installation
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2gobasepath \- Detect Base Path of X2go Server Installation
 x2gobasepath
 
 .SH DESCRIPTION
-\fBx2gobasepath\fR writes the X2go server installation base path (/usr, /usr/local, ...) to stdout.
+\fBx2gobasepath\fR writes the X2Go server installation base path (/usr, /usr/local, ...) to stdout.
 .PP
 \fBx2gobasepath\fR can be run with user privileges.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8
index cfc79fc..baef7e8 100644
--- a/x2goserver/man/man8/x2gocleansessions.8
+++ b/x2goserver/man/man8/x2gocleansessions.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gocleansessions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2gocleansessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
-x2gocleansessions \- X2go Server Cleanup Daemon
+x2gocleansessions \- X2Go Server Cleanup Daemon
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2gocleansessions \- X2go Server Cleanup Daemon
 x2gocleansessions
 
 .SH DESCRIPTION
-\fBx2gocleansessions\fR is run as a service on X2go servers to handle the cleanup of stale sessions.
+\fBx2gocleansessions\fR is run as a service on X2Go servers to handle the cleanup of stale sessions.
 .PP
 \fBx2gocleansessions\fR must be run (as a service) with root privileges.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8
index c27f142..18ffdd7 100644
--- a/x2goserver/man/man8/x2gocmdexitmessage.8
+++ b/x2goserver/man/man8/x2gocmdexitmessage.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gocmdexitmessage 8 "July 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gocmdexitmessage \- Exit Message of X2go Command
+x2gocmdexitmessage \- Exit Message of X2Go Command
 .SH SYNOPSIS
 'nh
 .fi
@@ -17,12 +17,12 @@ x2gocmdexitmessage <session_id>
 .SH DESCRIPTION
 \fBx2gocmdexitmessage\fR prints out the exit message of the last command run with \fBx2goruncommand\fR for session <session_id>.
 
-\fBx2gocmdexitmessage\fR is run with X2go user privileges.
+\fBx2gocmdexitmessage\fR is run with X2Go user privileges.
 .PP
 .SH RETURN VALUES
 \fBx2gocmdexitmessage\fR prints out the last command's exit message.
 .PP
 As exitcode \fBx2gocmdexitmessage\fR always returns 0.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8
index 01ac1b0..0ec4a07 100644
--- a/x2goserver/man/man8/x2godbadmin.8
+++ b/x2goserver/man/man8/x2godbadmin.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2godbadmin 8 "July 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2godbadmin 8 "July 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
-x2godbadmin \- X2go Server Database Administrator
+x2godbadmin \- X2Go Server Database Administrator
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,10 +15,10 @@ x2godbadmin \- X2go Server Database Administrator
 x2godbadmin <options>
 
 .SH DESCRIPTION
-\fBx2godbadmin\fR is used to set up the initial X2go session database and perform other
-maintenance tasks on the X2go server's database.
+\fBx2godbadmin\fR is used to set up the initial X2Go session database and perform other
+maintenance tasks on the X2Go server's database.
 .PP
 \fBx2godbadmin\fR must be run with root privileges.
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8
index f6e8584..be222c0 100644
--- a/x2goserver/man/man8/x2gofeature.8
+++ b/x2goserver/man/man8/x2gofeature.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gofeature 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2gofeature 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
-x2gofeature \- Query X2go Feature Availability on X2go Server
+x2gofeature \- Query X2Go Feature Availability on X2Go Server
 .SH SYNOPSIS
 'nh
 .fi
@@ -20,10 +20,10 @@ before trying to use them.
 .PP
 \fBx2gofeature\fR can be run with user privileges.
 .SH RETURN VALUES
-If feature <feature_name> is available on the X2go server, then ,,ok'' is written to stdout.
+If feature <feature_name> is available on the X2Go server, then ,,ok'' is written to stdout.
 Otherwise the expression ,,not available'' is written to stdout.
 .SH SEE ALSO
 /usr/share/x2go/x2gofeature.d/*.features
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8
index 3703f79..f804b9a 100644
--- a/x2goserver/man/man8/x2golistdesktops.8
+++ b/x2goserver/man/man8/x2golistdesktops.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistdesktops 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2golistdesktops 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
 x2golistdesktops \- List Available X Desktops
 .SH SYNOPSIS
@@ -19,10 +19,10 @@ x2golistdesktops [<server_hostname>]
 If no server hostname is given at the command line, the fully qualified domain name of the local system
 is used here.
 .PP
-\fBx2golistdesktops\fR is run with X2go user privileges and it is used by X2go clients to render
-a list of available desktops that may be candidates for X2go desktop sharing (shadow sessions).
+\fBx2golistdesktops\fR is run with X2Go user privileges and it is used by X2Go clients to render
+a list of available desktops that may be candidates for X2Go desktop sharing (shadow sessions).
 .PP
-The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2go desktop
+The list of desktops will include local desktop sessions (launched via KDM, GDM, etc.) run by the same user, X2Go desktop
 sessions run by the same user and desktop sessions of other users (local or remote) that are announced via 
 the \fBx2godesktopsharing\fR utility.
 .SH RETURN VALUES
@@ -32,5 +32,5 @@ As exitcode \fBx2golistdesktop\fR always returns 0.
 .SH SEE ALSO
 x2godesktopsharing(1)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8
index 1263a55..e8c19ad 100644
--- a/x2goserver/man/man8/x2golistmounts.8
+++ b/x2goserver/man/man8/x2golistmounts.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2golistmounts \- List Mounted Shares for an X2go Session
+x2golistmounts \- List Mounted Shares for an X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -18,8 +18,8 @@ x2golistmounts <session_id>
 \fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go
 session <session_id>.
 .PP
-\fBx2golistmounts\fR is run with normal user privileges and it is used by X2go clients to render
-a list of SSHFS mounts for a given X2go sessions.
+\fBx2golistmounts\fR is run with normal user privileges and it is used by X2Go clients to render
+a list of SSHFS mounts for a given X2Go sessions.
 .SH RETURN VALUES
 A line-by-line list of mounted shares is returned by \fBx2golistmounts\fR. Each line consists of
 two mount point attribute fields separated by the pipe symbol (,,|'').
@@ -33,5 +33,5 @@ As exitcode \fBx2golistmounts\fR always returns 0.
 .SH SEE ALSO
 x2gomountdirs(8), x2goumount-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8
index adbbac6..f1c162c 100644
--- a/x2goserver/man/man8/x2golistsessions.8
+++ b/x2goserver/man/man8/x2golistsessions.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistsessions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2golistsessions 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2golistsessions \- List Available X2go Sessions for User
+x2golistsessions \- List Available X2Go Sessions for User
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,17 +15,17 @@ x2golistsessions \- List Available X2go Sessions for User
 x2golistsessions [<server_hostname>|--all-servers]
 
 .SH DESCRIPTION
-\fBx2golistsessions\fR returns a list of running or suspended X2go sessions for X2go server <server_hostname>.
+\fBx2golistsessions\fR returns a list of running or suspended X2Go sessions for X2Go server <server_hostname>.
 If no server hostname is given at the command line, the session list query runs for the local system.
 .PP
-\fBx2golistsessions\fR is run with normal user privileges and it is used by X2go clients to render
-a list of available X2go sessions.
+\fBx2golistsessions\fR is run with normal user privileges and it is used by X2Go clients to render
+a list of available X2Go sessions.
 .SH X2GO CLUSTER MODE
 If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database
-of your X2go cluster is queried for running/suspended sessions belonging to the user executing this command.
-These sessions may be active on any of the X2go servers within you cluster.
+of your X2Go cluster is queried for running/suspended sessions belonging to the user executing this command.
+These sessions may be active on any of the X2Go servers within you cluster.
 .SH RETURN VALUES
-A line-by-line list of available X2go sessions. Each line consists of several session attribute fields separated by the pipe
+A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe
 symbol (,,|'').
 .PP
 The meaning of the session attributes of each output line are shown below:
@@ -50,5 +50,5 @@ As exitcode \fBx2golistsessions\fR always returns 0.
 .SH SEE ALSO
 x2golistsessions_root(8), x2golistdesktops(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8
index 9c7f18e..be21d7d 100644
--- a/x2goserver/man/man8/x2golistsessions_root.8
+++ b/x2goserver/man/man8/x2golistsessions_root.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2golistsessions_root 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2golistsessions_root 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
-x2golistsessions_root \- List X2go Sessions for System
+x2golistsessions_root \- List X2Go Sessions for System
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,7 +15,7 @@ x2golistsessions_root \- List X2go Sessions for System
 x2golistsessions_root [<server_hostname>]
 
 .SH DESCRIPTION
-\fBx2golistsessions_root\fR shows a list of all available X2go sessions on the server <server_hostname>.
+\fBx2golistsessions_root\fR shows a list of all available X2Go sessions on the server <server_hostname>.
 If no server hostname is given at the command line, the session list query runs for the local system.
 .PP
 \fBx2golistsessions_root\fR must be run with root privileges.
@@ -25,5 +25,5 @@ Same as explained in x2golistsessions(8).
 .SH SEE ALSO
 x2golistsessions(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8
index 33b8f09..81c8808 100644
--- a/x2goserver/man/man8/x2gomountdirs.8
+++ b/x2goserver/man/man8/x2gomountdirs.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gomountdirs 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gomountdirs 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gomountdirs \- Share Client-Side Folder with X2go Session
+x2gomountdirs \- Share Client-Side Folder with X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -16,9 +16,9 @@ x2gomountdirs <mount_type> <session_id> <username> <key_file> <dir1> [<dir2> [<d
 
 .SH DESCRIPTION
 \fBx2gomountdirs\fR mounts client-side folders or devices onto mountpoints that are accessible
-from within your remote X2go session.
+from within your remote X2Go session.
 .PP
-\fBx2gomountdirs\fR is run with X2go user privileges and normally issued by an X2go client application.
+\fBx2gomountdirs\fR is run with X2Go user privileges and normally issued by an X2Go client application.
 .SH ARGUMENTS
 .TP
 \*(T<\fB\<mount_type>\fR\*(T>
@@ -26,7 +26,7 @@ If the mount type is set to ,,dir'' then the client-side mount target is interpr
 it is interpreted as a device.
 .TP
 \*(T<\fB\<session_id>\fR\*(T>
-The <session_id> is the unique identifier of the X2go session that this command is run for.
+The <session_id> is the unique identifier of the X2Go session that this command is run for.
 .TP
 \*(T<\fB\<username>\fR\*(T>
 The owner of session <session_id> is given as the <username> argument.
@@ -35,11 +35,11 @@ The owner of session <session_id> is given as the <username> argument.
 Location of a temporary private SSH key file (only valid for this command execution).
 .TP
 \*(T<\fB\<dir1> [<dir2> [<dir3> [...]]]\fR\*(T>
-A list of client-side folders or device mount points that shall be mounted for X2go session <session_id>.
+A list of client-side folders or device mount points that shall be mounted for X2Go session <session_id>.
 .PP
 .SH PERMISSIONS
-X2go uses the fuse-based SSH filesystem (SSHFS) for sharing client-side file ressources with X2go sessions.
-Users that shall use X2go folder sharing must be members of the X2go server's ,,fuse'' POSIX group.
+X2Go uses the fuse-based SSH filesystem (SSHFS) for sharing client-side file ressources with X2Go sessions.
+Users that shall use X2Go folder sharing must be members of the X2Go server's ,,fuse'' POSIX group.
 .SH RETURN VALUES
 \fBx2gomountdirs\fR returns some mount point information to stdout if the mounting process has been successful.
 The mount results are printed line-by-line. The individual lines must be interpreted as shown below:
@@ -63,5 +63,5 @@ As exitcode \fBx2gomoundirs\fR always returns 0.
 .SH SEE ALSO
 x2goumount-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8
index eb0e246..b0db3a9 100644
--- a/x2goserver/man/man8/x2goresume-session.8
+++ b/x2goserver/man/man8/x2goresume-session.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goresume-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goresume-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goresume-session \- Resume X2go Session
+x2goresume-session \- Resume X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -18,15 +18,15 @@ x2goresume-session <session_id>
 \fBx2goresume-session\fR resumes the suspended session with session ID <session_id>.
 .PP
 This command is normally issued
-by an X2go client application with X2go user privileges.
+by an X2Go client application with X2Go user privileges.
 .SH RETURN VALUES
 \fBx2goresume-session\fR reports to stderr if resuming of session <session_id> failed. This
 very probably means that the session's X agent has died, so the session <session_id> will
-be marked as finished in the X2go session database.
+be marked as finished in the X2Go session database.
 .PP
 As exitcode \fBx2goresume-session\fR always returns 0.
 .SH SEE ALSO
 x2gostartagent(8), x2goruncommand(8), x2gosuspend-session(8), x2goterminate-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8
index 4a64515..52d03b4 100644
--- a/x2goserver/man/man8/x2goruncommand.8
+++ b/x2goserver/man/man8/x2goruncommand.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goruncommand 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goruncommand 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goruncommand \- Launch Command inside an X2go Session
+x2goruncommand \- Launch Command inside an X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,9 +15,9 @@ x2goruncommand \- Launch Command inside an X2go Session
 x2goruncommand <display> <agent_pid> <session_id> <command> <sound_system> <session_type>
 
 .SH DESCRIPTION
-\fBx2goruncommand\fR launches a(n X-based) command inside of a given X2go session.
+\fBx2goruncommand\fR launches a(n X-based) command inside of a given X2Go session.
 .PP
-\fBx2goruncommand\fR is run with X2go user privileges and normally executed by an X2go client application.
+\fBx2goruncommand\fR is run with X2Go user privileges and normally executed by an X2Go client application.
 .SH ARGUMENTS
 .TP
 \*(T<\fB\<display>\fR\*(T>
@@ -27,7 +27,7 @@ The X display number/port of the session this command is for.
 The process ID (pid) of the x2goagent instance that the given session runs in.
 .TP
 \*(T<\fB\<session_id>\fR\*(T>
-The <session_id> is the unique identifier of the X2go session that this command is intended for.
+The <session_id> is the unique identifier of the X2Go session that this command is intended for.
 .TP
 \*(T<\fB\<command>\fR\*(T>
 Execute command <command>. Full paths will be ignored, the command has to be in the server's $PATH.
@@ -46,5 +46,5 @@ As exitcode \fBx2goruncommand\fR always returns 0.
 .SH SEE ALSO
 x2gostartagent(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-sessions(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8
index f1cbf96..ac59d66 100644
--- a/x2goserver/man/man8/x2gosessionlimit.8
+++ b/x2goserver/man/man8/x2gosessionlimit.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosessionlimit 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Admin Tool"
+.TH x2gosessionlimit 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Admin Tool"
 .SH NAME
 x2gosessionlimit \- Detect Session Limit for User or Group
 .SH SYNOPSIS
@@ -17,5 +17,5 @@ x2gosessionlimit
 .SH DESCRIPTION
 \fBx2gosessionlimit\fR is not yet documented as a man page... TODO!
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8
index 372a995..f882265 100644
--- a/x2goserver/man/man8/x2goshowblocks.8
+++ b/x2goserver/man/man8/x2goshowblocks.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goshowblocks 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goshowblocks 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
 x2goshowblocks \- Show X2go-Mounted Block Devices
 .SH SYNOPSIS
@@ -15,12 +15,12 @@ x2goshowblocks \- Show X2go-Mounted Block Devices
 x2goshowblocks <username> <session_id>
 
 .SH DESCRIPTION
-\fBx2goshowblocks\fR lists mounted shares for user <username> and X2go session with ID <session_id>.
+\fBx2goshowblocks\fR lists mounted shares for user <username> and X2Go session with ID <session_id>.
 .PP
 The \fBx2goshowblocks\fR must be run with root privileges.
 
 .SH SEE ALSO
 x2gomountdirs(8), x2goumount-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8
index 65bc07e..4ba06c8 100644
--- a/x2goserver/man/man8/x2gostartagent.8
+++ b/x2goserver/man/man8/x2gostartagent.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gostartagent 8 "18 May 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gostartagent \- Start a New X2go Session
+x2gostartagent \- Start a New X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,10 +15,10 @@ x2gostartagent \- Start a New X2go Session
 x2gostartagent <geometry> <link_quality> <nx_pack_meth> <cache_type+dpi> <kblayout> <kbtype> <setkbd> <session_type> <command>
 
 .SH DESCRIPTION
-\fBx2gostartagent\fR coordinates the startup process of a new X2go session.
+\fBx2gostartagent\fR coordinates the startup process of a new X2Go session.
 It expects quite a list of parameters, all of which are obligatory.
 .PP
-\fBx2gostartagent\fR is run with X2go user privileges and normally executed by an X2go client application.
+\fBx2gostartagent\fR is run with X2Go user privileges and normally executed by an X2Go client application.
 .SH ARGUMENTS
 .TP
 \*(T<\fB\<geometry>\fR\*(T>
@@ -31,7 +31,7 @@ Any value out of: modem, isdn, adsl, wan or lan.
 NX compression method (see below for possible values).
 .TP
 \*(T<\fB\<cache_type+dpi>\fR\*(T>
-Cache type and color depth for X2go session window. The most common value is: unix-kde-depth_24 where ,,24'' is the color depth in bit.
+Cache type and color depth for X2Go session window. The most common value is: unix-kde-depth_24 where ,,24'' is the color depth in bit.
 .TP
 \*(T<\fB\<kblayout>\fR\*(T>
 Keyboard layout (e.g. us, de, etc.).
@@ -40,13 +40,13 @@ Keyboard layout (e.g. us, de, etc.).
 Keyboard type/model (e.g. pc105/us).
 .TP
 \*(T<\fB\<setkbd>\fR\*(T>
-Force setting keyboard layout and type within the X2go session on startup. Values: 0 or 1.
+Force setting keyboard layout and type within the X2Go session on startup. Values: 0 or 1.
 .TP
 \*(T<\fB\<session_type>\fR\*(T>
-Allowed values for <session_type> are: D (desktop), R (rootless) or S (shadow session, X2go desktop sharing).
+Allowed values for <session_type> are: D (desktop), R (rootless) or S (shadow session, X2Go desktop sharing).
 .TP
 \*(T<\fB\<command>\fR\*(T>
-The command given by the <command> argument is only used to create the session ID for this new X2go session. The
+The command given by the <command> argument is only used to create the session ID for this new X2Go session. The
 actual execution of a command is handled by \fBx2goruncommand\fR.
 .PP
 .SH RETURN VALUES
@@ -81,5 +81,5 @@ rfb-hextile, rfb-tight, rfb-tight-compressed
 .SH SEE ALSO
 x2goruncommand(8), x2goresume-session(8), x2gosuspend-session(8), x2goterminate-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8
index f78e978..5acfe24 100644
--- a/x2goserver/man/man8/x2gosuspend-session.8
+++ b/x2goserver/man/man8/x2gosuspend-session.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gosuspend-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2gosuspend-session \- Suspend an X2go Session
+x2gosuspend-session \- Suspend an X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -17,15 +17,15 @@ x2gosuspend-session <session_id>
 .SH DESCRIPTION
 \fBx2gosuspend-session\fR suspends the running session with session ID <session_id>.
 .PP
-This command is normally issued by an X2go client application with X2go user privileges.
+This command is normally issued by an X2Go client application with X2Go user privileges.
 .SH RETURN VALUES
 \fBx2gosuspend-session\fR reports to stderr if resuming of session <session_id> failed. This
 very probably means that the session's X agent has died, so the session <session_id> will
-be marked as finished in the X2go session database.
+be marked as finished in the X2Go session database.
 .PP
 As exitcode \fBx2gosuspend-session\fR always returns 0.
 .SH SEE ALSO
 x2gostartagent(8), x2goruncommand(8), x2goresume-session(8), x2goterminate-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8
index 9089c04..b619552 100644
--- a/x2goserver/man/man8/x2goterminate-session.8
+++ b/x2goserver/man/man8/x2goterminate-session.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goterminate-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goterminate-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goterminate-session \- Terminate an X2go Session
+x2goterminate-session \- Terminate an X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -17,7 +17,7 @@ x2goterminate-session <session_id>
 .SH DESCRIPTION
 \fBx2goterminate-session\fR cleanly terminates the running or suspended session with session ID <session_id>.
 .PP
-This command is normally issued by an X2go client application with X2go user privileges.
+This command is normally issued by an X2Go client application with X2Go user privileges.
 .SH RETURN VALUES
 By \fBx2goterminate-session\fR nothing is reported on stdout or stderr.
 .PP
@@ -25,5 +25,5 @@ As exitcode \fBx2goterminate-session\fR always returns 0.
 .SH SEE ALSO
 x2gostartagent(8), x2goruncommand(8), x2goresume-session(8), x2gosuspend-session(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8
index a2cc555..0af51fe 100644
--- a/x2goserver/man/man8/x2goumount-session.8
+++ b/x2goserver/man/man8/x2goumount-session.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goumount-session 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2goumount-session 8 "Sep 2011" "Version 3.0.99.x" "X2Go Server Tool"
 .SH NAME
-x2goumount-session \- Unshare mounted Folders from X2go Session
+x2goumount-session \- Unshare mounted Folders from X2Go Session
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,18 +15,18 @@ x2goumount-session \- Unshare mounted Folders from X2go Session
 x2goumount-session <session_id> [<local_path_on_client>]
 
 .SH DESCRIPTION
-\fBx2goumount-session\fR is used to unshare client folders from X2go session with session ID <session_id>.
-Shared folders have been previously mounted into the X2go session by the \fBx2gomountdirs\fR command.
+\fBx2goumount-session\fR is used to unshare client folders from X2Go session with session ID <session_id>.
+Shared folders have been previously mounted into the X2Go session by the \fBx2gomountdirs\fR command.
 .PP
-\fBx2goumount-session\fR is run with X2go user privileges and normally issued by an X2go client application.
+\fBx2goumount-session\fR is run with X2Go user privileges and normally issued by an X2Go client application.
 .SH ARGUMENTS
 .TP
 \*(T<\fB\<session_id>\fR\*(T>
-Unmount shared folder(s) as registered for X2go session ID <session_id> in the X2go session database.
+Unmount shared folder(s) as registered for X2Go session ID <session_id> in the X2Go session database.
 .TP
 \*(T<\fB\<local_path_on_client>\fR\*(T>
 Optionally, you can name a local path name (path name as found on the client-side) here. If given,
-only the named folder is unshared from the X2go session <session_id>.
+only the named folder is unshared from the X2Go session <session_id>.
 .PP
 If this optional argument is omitted, then ALL session folders will be unshared (including spool folders for printing and MIME box).
 .SH RETURN VALUES
@@ -38,5 +38,5 @@ unmounting a shared folder a non-zero exit code is returned.
 .SH SEE ALSO
 x2gomountdirs(8)
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8
index 4d99559..f91997c 100644
--- a/x2goserver/man/man8/x2goversion.8
+++ b/x2goserver/man/man8/x2goversion.8
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)"
+.TH x2goversion 8 "31 May 2011" "Version 3.0.99.x" "X2Go Server Tool (Extension)"
 .SH NAME
-x2goversion \- Retrieve Code Versions of X2go Server Components
+x2goversion \- Retrieve Code Versions of X2Go Server Components
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,24 +15,24 @@ x2goversion \- Retrieve Code Versions of X2go Server Components
 x2goversion [<x2go-component>]
 
 .SH DESCRIPTION
-\fBx2goversion\fR allows to retrieve code versions of X2go server components.
+\fBx2goversion\fR allows to retrieve code versions of X2Go server components.
 .PP
 If the
-\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2go server
+\fB[<x2go-component>]\fR parameter is omitted then a list of all available X2Go server
 component names and versions is listed.
 .PP
-If an X2go component is specified with the \fB[<x2go-component>]\fR parameter, then only the
+If an X2Go component is specified with the \fB[<x2go-component>]\fR parameter, then only the
 component's version is printed to stdout.
 .PP
-The \fBx2goversion\fR tool can be used by X2go client implementations to query server-side versions
-of X2go components.
+The \fBx2goversion\fR tool can be used by X2Go client implementations to query server-side versions
+of X2Go components.
 .SH RETURN VALUES
-\fBx2goversion\fR reports X2go component version information to stdout.
+\fBx2goversion\fR reports X2Go component version information to stdout.
 .PP
 As exitcode \fBx2goversion\fR always returns 0.
 .SH FILES
 /usr/share/x2go/versions/VERSION.*
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index af5afee..93da29a 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index d65d752..fa9672b 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 6f4a510..045999f 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features
index 44458d9..6cf528c 100755
--- a/x2goserver/share/x2gofeature.d/x2goserver.features
+++ b/x2goserver/share/x2gofeature.d/x2goserver.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
 
 X2GO_FEATURE=$1
 
-# check for X2go server core features
+# check for X2Go server core features
 case "$X2GO_FEATURE" in
 
     "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;;
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
index 2b66245..94320dd 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2gosqlitewrapper.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the  X2go Project - http://www.x2go.org
+ * This file is part of the  X2Go Project - http://www.x2go.org
  * Copyright (C) 2011 Mike Gabriel <mike.gabriel at das-netzwerkteam.de> 
  * Copyright (C) 2011 Moritz 'Morty' Strübe <morty at gmx.net>
  *


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).




More information about the x2go-commits mailing list