[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-10-gef0cd78
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:21 CET 2014
The branch, build-baikal has been updated
via ef0cd78fb0629ded896a4295b2c9add7a6608560 (commit)
from f7d6e9545fd25b055a80d5442f94916d676f2e3f (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:
debian/changelog | 1 +
x2go/client.py | 14 +++++++-------
x2go/forward.py | 2 +-
x2go/mimeboxactions.py | 4 ++--
x2go/session.py | 6 +++---
5 files changed, 14 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c942d7b..1698a0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low
- Add sshproxy_port option to session (SSH proxy) options.
- Implementation of session profile parameters ,,sshproxysameuser''
and ,,sshproxysameauth''.
+ - Fixing typos in __doc__ strings.
* /debian/rules:
+ Allow package build on systems with missing dh_python2.
diff --git a/x2go/client.py b/x2go/client.py
index 8098270..53a3ab2 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1041,7 +1041,7 @@ class X2goClient(object):
hostname of the host the session is connected to (or
about to connect to).
- @param session_uuid: the X2Go sessions UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: the host an X2Go session is connected to
@@ -1058,7 +1058,7 @@ class X2goClient(object):
application (e.g. like it has been specified in the session
profile).
- @param session_uuid: the X2Go sessions UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: the hostname for the queried X2Go session as specified
@@ -1422,7 +1422,7 @@ class X2goClient(object):
with L{register_session} (initialization of session parameters) and
connect to it with L{connect_session} (authentication).
- @param session_uuid: the X2Go sessions UUID registry hash
+ @param session_uuid: the X2Go session's UUID registry hash
@type session_uuid: C{str}
@return: returns True if this method has been successful
@@ -1524,8 +1524,8 @@ class X2goClient(object):
Normally, you will use this method to suspend a registered session that you
have formerly started/resumed from within your recent
- L{X2goClient} instance. For this you simply call this method
- using the sessions C{session_uuid}, leave the C{session_name}
+ L{X2goClient} instance. For this you simply call this method
+ using the session's C{session_uuid}, leave the C{session_name}
empty.
Alternatively, you can suspend a non-associated X2Go session:
@@ -1565,8 +1565,8 @@ class X2goClient(object):
Normally you will use this method to terminate a registered session that you
have formerly started/resumed from within your recent
- L{X2goClient} instance. For this you simply call this method
- using the sessions C{session_uuid}, leave the C{session_name}
+ L{X2goClient} instance. For this you simply call this method
+ using the session's C{session_uuid}, leave the C{session_name}
empty.
Alternatively, you can terminate a non-associated X2Go session:
diff --git a/x2go/forward.py b/x2go/forward.py
index 5cb2c00..a933424 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -230,7 +230,7 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
@type remote_host: C{str}
@param remote_port: ... on port C{<remote_port>}
@type remote_port: C{int}
- @param ssh_transport: the Paramiko/SSH transport (i.e. the X2Go sessions Paramiko/SSH transport object)
+ @param ssh_transport: the Paramiko/SSH transport (i.e. the X2Go session's Paramiko/SSH transport object)
@type ssh_transport: C{obj}
@param session_instance: the L{X2goSession} instance that initiates this tunnel
@type session_instance: C{obj}
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 5a2f0f4..a2749f4 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -100,7 +100,7 @@ class X2goMIMEboxAction(object):
@param mimebox_file: file name as placed in to the X2Go MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2Go sessions's MIME box directory
+ @param mimebox_dir: location of the X2Go session's MIME box directory
@type mimebox_dir: C{str}
"""
@@ -113,7 +113,7 @@ class X2goMIMEboxAction(object):
@param mimebox_file: file name as placed in to the X2Go MIME box directory
@type mimebox_file: C{str}
- @param mimebox_dir: location of the X2Go sessions's MIME box directory
+ @param mimebox_dir: location of the X2Go session's MIME box directory
@type mimebox_dir: C{str}
"""
diff --git a/x2go/session.py b/x2go/session.py
index 228c4bc..346a452 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -166,7 +166,7 @@ class X2goSession(object):
@type control_session: C{X2goControlSession*} instance
@param use_sshproxy: for communication with X2Go server use an SSH proxy host
@type use_sshproxy: C{bool}
- @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go sessions password / key file
+ @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go session's password / key file
@type sshproxy_reuse_authinfo: C{bool}
@param profile_id: profile ID
@type profile_id: C{str}
@@ -775,7 +775,7 @@ class X2goSession(object):
def get_username(self):
"""\
After a session has been set up you can query the
- username the sessions runs as.
+ username the session runs as.
@return: the remote username the X2Go session runs as
@rtype: C{str}
@@ -1115,7 +1115,7 @@ class X2goSession(object):
@type force_password_auth: C{bool}
@param use_sshproxy: use an SSH proxy host for connecting the target X2Go server
@type use_sshproxy: C{bool}
- @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go sessions password / key file
+ @param sshproxy_reuse_authinfo: for proxy authentication re-use the X2Go session's password / key file
@type sshproxy_reuse_authinfo: C{bool}
@param sshproxy_user: username for authentication against the SSH proxy host
@type sshproxy_user: C{str}
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list