merging master

nicola · nicola · commit 732ef4ae495d · 2015-07-13T00:41:51.000+02:00
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ Options:
    -C, --cert              Path to the ssl cert
    --webid                 Enable WebID+TLS authentication
    -s, --secret            HTTP Session secret key (e.g. "your secret phrase")
-   -s, --no-live           Disable live support through WebSockets
+   --no-live           Disable live support through WebSockets
    -sA, --suffix-acl       Suffix for acl files (default: '.acl')
    -sC, --suffix-changes   Suffix for acl files (default: '.changes')
    -sE, --suffix-sse       Suffix for SSE files (default: '.events')
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -58,7 +58,6 @@ var argv = require('nomnom')
   .option('noLive', {
     full: 'no-live',
     help: 'Disable live support through WebSockets',
-    abbr: 's',
     flag: true
   })
   .option('suffixAcl', {
