You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/25 00:57:54 UTC
[1/2] incubator-guacamole-manual git commit: GUACAMOLE-172: Document
use of "nop" by Guacamole clients.
Repository: incubator-guacamole-manual
Updated Branches:
refs/heads/master 431038c96 -> b6875f18a
GUACAMOLE-172: Document use of "nop" by Guacamole clients.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/b53d2ddd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/b53d2ddd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/b53d2ddd
Branch: refs/heads/master
Commit: b53d2ddddcfe9511e874d73c5001da28e8d77805
Parents: 431038c
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jan 24 11:33:17 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jan 24 11:33:17 2017 -0800
----------------------------------------------------------------------
src/references/instructions/client/control/nop.xml | 12 ++++++++++++
src/references/instructions/server/control/nop.xml | 12 ++++++------
src/references/protocol.xml | 1 +
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/b53d2ddd/src/references/instructions/client/control/nop.xml
----------------------------------------------------------------------
diff --git a/src/references/instructions/client/control/nop.xml b/src/references/instructions/client/control/nop.xml
new file mode 100644
index 0000000..41a11d9
--- /dev/null
+++ b/src/references/instructions/client/control/nop.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xml:id="client-nop-instruction" xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <title>nop</title>
+ <indexterm>
+ <primary>nop</primary>
+ </indexterm>
+ <para>The client "nop" instruction does absolutely nothing, has no parameters, and is
+ universally ignored by the Guacamole server. Its main use is as a keep-alive signal, and may
+ be sent by Guacamole clients when there is no activity to ensure the socket is not closed
+ due to timeout.</para>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/b53d2ddd/src/references/instructions/server/control/nop.xml
----------------------------------------------------------------------
diff --git a/src/references/instructions/server/control/nop.xml b/src/references/instructions/server/control/nop.xml
index 704a8ed..bf7486e 100644
--- a/src/references/instructions/server/control/nop.xml
+++ b/src/references/instructions/server/control/nop.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<section xml:id="nop-instruction" xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en"
+<section xml:id="server-nop-instruction" xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en"
xmlns:xi="http://www.w3.org/2001/XInclude">
<title>nop</title>
<indexterm>
<primary>nop</primary>
</indexterm>
- <para>The nop instruction does absolutely nothing, has no parameters, and is universally ignored
- by Guacamole clients. Its main use is as a keep-alive signal, and may be sent by guacd or
- client plugins when there is no activity to ensure the socket is not closed due to
- timeout.</para>
-</section>
\ No newline at end of file
+ <para>The server "nop" instruction does absolutely nothing, has no parameters, and is
+ universally ignored by Guacamole clients. Its main use is as a keep-alive signal, and may be
+ sent by guacd or client plugins when there is no activity to ensure the socket is not closed
+ due to timeout.</para>
+</section>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/b53d2ddd/src/references/protocol.xml
----------------------------------------------------------------------
diff --git a/src/references/protocol.xml b/src/references/protocol.xml
index 690023b..f429a5c 100644
--- a/src/references/protocol.xml
+++ b/src/references/protocol.xml
@@ -99,6 +99,7 @@
<secondary>control</secondary>
</indexterm>
<xi:include href="instructions/client/control/disconnect.xml"/>
+ <xi:include href="instructions/client/control/nop.xml"/>
<xi:include href="instructions/client/control/sync.xml"/>
</section>
<section xml:id="server-control-instructions">
[2/2] incubator-guacamole-manual git commit: GUACAMOLE-172: Merge
documentation for nop instruction.
Posted by jm...@apache.org.
GUACAMOLE-172: Merge documentation for nop instruction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/b6875f18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/b6875f18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/b6875f18
Branch: refs/heads/master
Commit: b6875f18ac6f21c83280cd1001f50c5e6937c33f
Parents: 431038c b53d2dd
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jan 24 16:57:27 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jan 24 16:57:27 2017 -0800
----------------------------------------------------------------------
src/references/instructions/client/control/nop.xml | 12 ++++++++++++
src/references/instructions/server/control/nop.xml | 12 ++++++------
src/references/protocol.xml | 1 +
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------