Updated examples in manual page.

diff --git a/config.h b/config.h
index 3d42eefbc0cf3bd140e7d7fef8f7569839a7d519..fafda1f309431cc7445c4c3acab4bdb56aa487c1 100644 (file)
--- a/config.h
+++ b/config.h
@@ -135,7 +135,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "155"
+#define VCS_REVISION "157"
 
 /* Version number of package */
 #define VERSION "2.9"

diff --git a/configure b/configure
index 9e607aa04ceee487d1677090d5d4fe82c4a0f5f1..b33d439676560058490495ea7d861152263504b8 100755 (executable)
--- a/configure
+++ b/configure
@@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=155
+VCS_REVISION=157
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 6a35dbb651a1de26d8dcbfd2ef8f7fdf0b228323..f86785a5a918d0d0a8c49988fae228ccbd33a87d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
-VCS_REVISION=155
+VCS_REVISION=157
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/demo/vt100.js b/demo/vt100.js
index 3c755a841e9ad36fa10ac3e088080cc050540b8b..2e9f4d444d4b98aad062fd62c1092a7b985ebc0a 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 155)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 157)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 439443f62c9eb79ddd83ad64e73bf266784e4d30..b4f80b862d792906a6070220387d28a7fa627e71 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.9 (revision 155)" +
+  alert("Shell In A Box version " + "2.9 (revision 157)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/shellinaboxd.man.in b/shellinabox/shellinaboxd.man.in
index f45a4f4d26d008c1cfc6bf74aa58819ff2b9d92b..ba3b0e4ffe75bb71081bde2a2d19fff3442e0388 100644 (file)
--- a/shellinabox/shellinaboxd.man.in
+++ b/shellinabox/shellinaboxd.man.in
@@ -484,14 +484,22 @@ A small number of run-time configuration options are available from a
 context menu that becomes available when clicking the right mouse button.
 .SH EXAMPLES
 .TP \w'shellinaboxd\ 'u
+.B shellinaboxd
+Attaches a web-enabled login shell to
+.IR https://localhost:4200/ .
+If the user connected without SSL, the session will automatically be promoted.
+Unless SSL certificates can be found in the current directory, the daemon will
+automatically generate suitable self-signed certificates. If the command was
+invoked by a non-\fBroot\fP user, the daemon uses
+.B ssh
+instead of
+.B /bin/login
+for the session.
+.TP
 .B shellinaboxd -t
 Attaches a web-enabled login shell to
 .I http://localhost:4200/
-with SSL/TLS support disabled. This command must be run as
-.B root
-or the attempt to launch
-.I /bin/login
-will fail.
+with SSL/TLS support disabled.
 .TP
 .B shellinaboxd -t -f beep.wav:/dev/null
 Runs all services with the audible-bell permanently disabled.

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 3c755a841e9ad36fa10ac3e088080cc050540b8b..2e9f4d444d4b98aad062fd62c1092a7b985ebc0a 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.9 (revision 155)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 157)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };