Merge branch 'master' into datarestructure

2019-08-11 22:01:29 +01:00
parent e5adcfef4c 1c8cbf808b
commit 63539a4edb
10 changed files with 119 additions and 120 deletions
--- a/conf/help.json
+++ b/conf/help.json
@@ -3,8 +3,7 @@
    "logout": "logout",
    "del": "del <network> <relay>",
    "mod": "mod <network> <variable> <value>",
-    "get": "get <name>",
-    "key": "key <master|list|add|del|except|unexcept|listexcept|monitor> [<name>] [<target>] [<key...>] [<on|off>]",
+    "get": "get <name> <variable>",
    "who": "who <query>",
    "join": "join <network> <relay> <channel> [<key>]",
    "part": "part <network> <relay> <channel>",