Merge branch 'master' into nonophp

diff --git a/faq/index.html.tt2 b/faq/index.html.tt2
index 0884e9d..a810e02 100644 (file)
--- a/faq/index.html.tt2
+++ b/faq/index.html.tt2
@@ -174,8 +174,10 @@
         <p>There are no default passwords - all accounts are locked by
         default for security reasons. Even local logins are not
         possible (unless you set a password or create new user
-        accounts as root).  You can create valid passwords using "sudo
-        passwd [username]" from the shell individually.</p>
+        accounts as root). You can create valid passwords using "sudo
+        passwd [username]" from the shell individually. To set a password
+        for the Grml user and enable SSH login you can use the 'ssh'
+        boot option, like 'ssh=yourpassword'.</p>
 
         <h3><a name="version"></a><a href="#toc">How do I find out the version of Grml</a></h3>
 

diff --git a/grml2usb/grml2usb.tgz b/grml2usb/grml2usb.tgz
index e19942f..0295916 100644 (file)
Binary files a/grml2usb/grml2usb.tgz and b/grml2usb/grml2usb.tgz differ

diff --git a/grml2usb/grml2usb.tgz.md5 b/grml2usb/grml2usb.tgz.md5
index 5d9b906..70001ae 100644 (file)
--- a/grml2usb/grml2usb.tgz.md5
+++ b/grml2usb/grml2usb.tgz.md5
@@ -1 +1 @@
-81fb5b18dba473c9d4b0d81a845a630c  grml2usb.tgz
+a12d914a9397f605fac3a1b1d94e306b  grml2usb.tgz

diff --git a/grml2usb/grml2usb.tgz.md5.asc b/grml2usb/grml2usb.tgz.md5.asc
index ee39036..150034c 100644 (file)
--- a/grml2usb/grml2usb.tgz.md5.asc
+++ b/grml2usb/grml2usb.tgz.md5.asc
@@ -1,22 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-81fb5b18dba473c9d4b0d81a845a630c  grml2usb.tgz
+a12d914a9397f605fac3a1b1d94e306b  grml2usb.tgz
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
+Version: GnuPG v1.4.11 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO91u4AAoJEL7IfitBhWKa66EP/R6LLWX7FLxtSaGRWvg+wWHx
-0KX7KBLUp8BZ4N/YqAcUq+F2Uduz5V712BLt5PQGbkg45KJsxvZFX3HciATtYN+U
-tqAHF7QYD0M/AZV0zakd/riMSGYceYPD6D0686CCOJhbjrvcyw2b/4JNsDhICaGI
-IeDL8wjmNUZ/IoJdH36qbWkJpE6M8hcBWPm74vtQRm2JC8rgv/QfVjEXGLpJIJnX
-qudNcRDeq17JbGuIJASmG1eza1gitHmIxJCl48Zr2CdKrhNcb9M8ceBA9KfNafou
-LyBwCztN43gQAIrVUGY1mbJuOGmkb3tu+urfres8fyRwo8NYUGUbOsL+ilk/36YY
-V9Cg4TxrAjSSypJGl8tuhW+/dGRF5QFJlEwmuAtO02gLjQMwVwPg1XwrmTSQ1wGI
-dX1aJS4vUzTrZa2HjkoPZMTM+CM8XvhALaTYEO+RoDHJxPhIJ1NlvoXmLIhga2H4
-Z7MWSOCBTAcUcGB9K5Y4XQ6wjPmpXtz61MnOGSoHyusWewGKlO9d5+1zqvpLNivs
-5Ku7PuVqEJLPd4NmkiYEUDlvXRltjnt5vlUt7ZTmkI6Q+I7pMtlK+mM1i+VeiQ8+
-OmKkeTvsb4MYgOU+IzIlyj+TAxCaA+3ZHTEYVqyNeXekOQI6STbDsaS9fekSJqoO
-Na6Oc0S8ZydL6DQ/0I6A
-=5w2p
+iEYEARECAAYFAk8LChAACgkQ2N9T+zficujV8gCdF0ZnAAgirECrBoricR5/ZYP5
+/R8An1glA/bkl2OArX1EOCw+cNXTPKin
+=K3tZ
 -----END PGP SIGNATURE-----
-

diff --git a/team/index.html.tt2 b/team/index.html.tt2
index b1df04f..4ac9baf 100644 (file)
--- a/team/index.html.tt2
+++ b/team/index.html.tt2
@@ -34,7 +34,6 @@
                 <li>Andreas Gredler (jimmy)</li>
                 <li>Christian Hofstaedtler (ch)</li>
                 <li>Frank Terbeck (ft)</li>
-                <li>Gerfried Fuchs (rhonda)</li>
                 <li>Michael Prokop (mika)</li>
                 <li>Ulrich Dangel (mru)</li>
             </ul>
@@ -58,6 +57,7 @@
                 <li>Carsten Hey</li>
                 <li>Christoph Biedl</li>
                 <li>Eduard Bloch</li>
+                <li>Gerfried Fuchs</li>
                 <li>Gregor Perner</li>
                 <li>Jan-Pieter Jacobs</li>
                 <li>Jens Kubieziel</li>