This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch x2goserver-xsettings in repository x2goserver. commit 867ba19e5ab0c25ff43754bee17af055f9606142 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 24 03:33:53 2014 +0100 xsettings: documentation update, describe the newly implemented features. --- .../man/man8/x2goserver-xsettings.8.in | 38 +++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in index 4632f44..c9b08d0 100644 --- a/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in +++ b/x2goserver-xsettings/man/man8/x2goserver-xsettings.8.in @@ -1,4 +1,4 @@ -.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0-preview" "X2Go Server Component" +.TH x2goserver-xsettings 8 "Nov 2014" "Version 4\&.1\&.0\&.0\&-preview" "X2Go Server Component" .SH "DESCRIPTION" \fBx2goserver-xsettings\fP is an \fBx2goserver\fP component providing support for the \fIXSETTINGS\fP protocol\&. @@ -24,16 +24,38 @@ system are very common\&. For this reason \fBxsettingsd\fP has been adopted as the tool of choice to provide \fBXSETTINGS\fP support\&. It has no run time dependencies other than the -C++ run time it has been built against\&. Settings are read from a plain text +C++ runtime it has been built against\&. Settings are read from a plain text file\&. This package provides hooks for starting \fBxsettingsd\fP\&. .SH "CONFIGURATION" -\fBxsettingsd\fP uses plain text files as configuration storage\&. A default -configuration handling issues with GTK-based applications is shipped as -\fI@@SYSCONFDIR@@/xsettings\fP\&. Edit the file to suit your needs\&. - -More sophisticated configuration handling is scheduled to be implemented at a -later date and this documentation updated accordingly\&. +\fBxsettingsd\fP uses plain text files as configuration storage\&. + +The files taken into consideration depend upon the client system. +.IP \[bu] 2 +UNIX-like systems +.RS +On UNIX-like systems already using the X server as their main display server, +the user's current \fIXSETTINGS\fP will be transfered to the X2Go server by the +client application and used as the base configuration\&. This assumes that a +working xsettings configuration daemon is already running. If this not the +case, the behavior will be similar to Windows and OS X systems\&. +.RE +.IP \[bu] +Windows and OS X systems +.RS +As those systems do not use the X server as their main display server, no user +configuration will be transfered to the server. The base configuration will be +determined by the default configuration file shipped by X2Go as +\fI@@SYSCONFDIR@@/xsettings\fP\&. The shipped default configuration handles +issues with GTK\&-based applications by providing sane defaults\&. It may be +modified by a system administrator\&. +.RE + +All settings can be overridden per-user via a custom file +\fI$HOME/\&.xsettings\&-x2go\fP\&. If it does not exist, this file will be +created automatically the first time a session is started\&. The generated file +will only contain comments describing what it is used for and when it was +created\&. .SH "SEE ALSO" \fIxsettingsd\fP(1) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git