[X2Go-Commits] [x2goserver] 04/04: general: change X2go -> X2Go.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 1347c0cea22815f2c77599e6614bf75551212398
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jan 9 04:15:40 2015 +0100

    general: change X2go -> X2Go.
    
    Cherry-picked from master branch.
    
    Conflicts:
      INSTALL
      debian/changelog
      x2goserver/man/man8/x2golistmounts.8
---
 INSTALL                                            |    6 +++---
 debian/changelog                                   |    1 +
 x2goserver-fmbindings/man/man8/x2gofm.8            |    2 +-
 .../x2gofeature.d/x2goserver-fmbindings.features   |    4 ++--
 x2goserver/man/man8/x2golistmounts.8               |    2 +-
 x2goserver/man/man8/x2goruncommand.8               |    2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index c006039..62fd5b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 TARBALL INSTALLATION OF x2goserver
 ==================================
 
-1.) USERS + GROUPS for X2go
+1.) USERS + GROUPS for X2Go
 ---------------------------
 Set up x2gouser account and its group if they do not exist
 already:
@@ -55,7 +55,7 @@ Alternatively, you can add a single line to /etc/rc.local:
 
 5.) LOCAL FOLDER SHARING
 ------------------------
-Users that shall be able to use X2go's local folder sharing functionality (via sshfs)
+Users that shall be able to use X2Go's local folder sharing functionality (via sshfs)
 have to be members of your server system's ,,fuse'' group
 
  $ usermod -a -G fuse <username>
@@ -83,7 +83,7 @@ This variant is the default X2Go database setup. The X2Go database keeps track o
 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 053a167..7f9327a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
       parse the full desktop file if there are non-Desktop Entries groups.
       Based on a patch submitted by Jason Alavaliant. Fixes: #812.
     - x2goserver/bin/x2gogetapps: do not print spurious newlines.
+    - Change string "X2go" to "X2Go" where appropriate.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 24 Feb 2015 22:11:49 +0100
 
diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8
index b57d9d6..4ad9c4b 100644
--- a/x2goserver-fmbindings/man/man8/x2gofm.8
+++ b/x2goserver-fmbindings/man/man8/x2gofm.8
@@ -22,5 +22,5 @@ client-side folders shared via X2Go.
 The default file browser is defined by the freedesktop.org specification of the running desktop
 environment.
 .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-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features
index 1736904..d3cad6b 100755
--- a/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features
+++ b/x2goserver-fmbindings/share/x2go/x2gofeature.d/x2goserver-fmbindings.features
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007-2015 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2015 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_FMBINDINGS") echo "ok"; exit 0;;
diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8
index 4da4799..8a510f1 100644
--- a/x2goserver/man/man8/x2golistmounts.8
+++ b/x2goserver/man/man8/x2golistmounts.8
@@ -15,7 +15,7 @@ x2golistmounts \- List Mounted Shares for an X2Go Session
 x2golistmounts <session_id>
 
 .SH DESCRIPTION
-\fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go
+\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
diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8
index 887369c..8a5f2c8 100644
--- a/x2goserver/man/man8/x2goruncommand.8
+++ b/x2goserver/man/man8/x2goruncommand.8
@@ -35,7 +35,7 @@ Execute command <command>. Full paths will be ignored, the command has to be in
 Possible generic values for <command> are: WWWBROWSER, OFFICE, MAILCLIENT and TERMINAL.
 .TP
 \*(T<\fB\<sound_system>\fR\*(T>
-Either of the possible sound systems supported by X2go: pulse, esd, arts (obsolete) or none.
+Either of the possible sound systems supported by X2Go: pulse, esd, arts (obsolete) or none.
 .TP
 \*(T<\fB\<session_type>\fR\*(T>
 Allowed values for <session_type> are: D (desktop) and R (rootless).

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git