mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #201 from hilbrichtsoftware/master 

Change 4 lines in the docs to reflect that the server sends server-co…
pull/212/head
Jonathan Moore Liles 2016-10-13 15:26:29 -07:00 committed by GitHub
parent f572e331ee 35d06de361
commit a22f33f486
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
session-manager/doc/API.html
View File

@ -228,7 +228,7 @@ Presently, the server <tt>capabilities</tt> are:
<strong>Fig. 1.2.</strong> Available Server Capabilities <strong>Fig. 1.2.</strong> Available Server Capabilities
</caption> </caption>
<tr><th>Name</th><th>Description</th></tr> <tr><th>Name</th><th>Description</th></tr>
<tr><td>server_control</td><td>client-to-server control</td></tr> <tr><td>server-control</td><td>client-to-server control</td></tr>
<tr><td>broadcast</td><td>server responds to /nsm/server/broadcast message</td></tr> <tr><td>broadcast</td><td>server responds to /nsm/server/broadcast message</td></tr>
<tr><td>optional-gui</td><td>server responds to optional-gui messages--if this capability is not present then clients with optional-guis MUST always keep them visible</td></tr> <tr><td>optional-gui</td><td>server responds to optional-gui messages--if this capability is not present then clients with optional-guis MUST always keep them visible</td></tr>
</table></div></center> </table></div></center>
@ -491,7 +491,7 @@ Clients which have this capability should include <tt>:message:</tt> in their <t
</table></div></center> </table></div></center>
<h3 id="n:1.2.6.">1.2.6. Client to Server Control</h3> <h3 id="n:1.2.6.">1.2.6. Client to Server Control</h3>
<p> <p>
If the server publishes the <tt>:server_control:</tt> capability, then clients can also initiate action by the server. For example, a client might implement a 'Save All' option which sends a <tt>/nsm/server/save</tt> message to the server, rather than requiring the user to switch to the session management interface to effect the save. If the server publishes the <tt>:server-control:</tt> capability, then clients can also initiate action by the server. For example, a client might implement a 'Save All' option which sends a <tt>/nsm/server/save</tt> message to the server, rather than requiring the user to switch to the session management interface to effect the save.
</p> </p>
<h3 id="n:1.2.7.">1.2.7. Server Control API</h3> <h3 id="n:1.2.7.">1.2.7. Server Control API</h3>
<p> <p>

4
session-manager/doc/API.mu
View File

@ -213,7 +213,7 @@
// Available Server Capabilities // Available Server Capabilities
[[ Name, Description [[ Name, Description
[[ server_control, client-to-server control [[ server-control, client-to-server control
[[ broadcast, server responds to /nsm/server/broadcast message [[ broadcast, server responds to /nsm/server/broadcast message
[[ optional-gui, server responds to optional-gui messages--if this capability is not present then clients with optional-guis MUST always keep them visible [[ optional-gui, server responds to optional-gui messages--if this capability is not present then clients with optional-guis MUST always keep them visible
@ -509,7 +509,7 @@
::: Client to Server Control ::: Client to Server Control
If the server publishes the `:server\_control:` capability, then If the server publishes the `:server-control:` capability, then
clients can also initiate action by the server. For example, a clients can also initiate action by the server. For example, a
client might implement a 'Save All' option which sends a client might implement a 'Save All' option which sends a
`\/nsm\/server\/save` message to the server, rather than requiring `\/nsm\/server\/save` message to the server, rather than requiring