Merge branch 'master' into patch-1

diff --git a/bugs/known/index.html.tt2 b/bugs/known/index.html.tt2
index eaa4481..f18ce5f 100644 (file)
--- a/bugs/known/index.html.tt2
+++ b/bugs/known/index.html.tt2
@@ -36,6 +36,8 @@
         <h2>Known Bugs in Grml 2017.05</h2>
 
         <ul>
+          <li><a href="https://github.com/grml/grml/issues/76">#76: gpm isn't started</a></li>
+          <li><a href="https://github.com/grml/grml/issues/65">#65: grml-terminalserver-config doesn't work</a></li>
           <li><a href="https://github.com/grml/grml/issues/55">#55: grml-hwinfo: sysdump causing grml-hwinfo to hang</a></li>
           <li><a href="https://github.com/grml/grml/issues/53">#53: grml-chroot not reliable with its recursive /dev bind mounts</a></li>
           <li><a href="https://github.com/grml/grml/issues/50">#50: locale issue during grml-autoconfig bootup</a></li>

diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 17da6ca..2afad67 100644 (file)
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -116,7 +116,7 @@
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
-    <option value="i386">32-bit PC (i586+)</option>
+    <option value="i386">32-bit PC (i686+)</option>
     <option value="96">One for both (~1.2GB)</option>
     </select>
     <br />
@@ -161,8 +161,8 @@
     <script type="text/javascript">
     function update_arch() {
         var flavour = document.getElementById('download_flavour').value;
-        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~550MB)</option>';
-        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~1.2GB)</option>';
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~550MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~1.2GB)</option>';
         update_links();
     }
 

diff --git a/download/prerelease/index.html.tt2 b/download/prerelease/index.html.tt2
index 8b1b83a..4c81d15 100644 (file)
--- a/download/prerelease/index.html.tt2
+++ b/download/prerelease/index.html.tt2
@@ -120,7 +120,7 @@ exit;
     <br /><br />
     <select name="arch" id="download_arch" style="width:100%;">
     <option value="amd64" selected="selected">64-bit PC (amd64)</option>
-    <option value="i386">32-bit PC (i586+)</option>
+    <option value="i386">32-bit PC (i686+)</option>
     <option value="96">One for both (~1.2GB)</option>
     </select>
     <br />
@@ -154,8 +154,8 @@ exit;
     <script type="text/javascript">
     function update_arch() {
         var flavour = document.getElementById('download_flavour').value;
-        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~550MB)</option>';
-        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i586+)</option><option value="96">One for both (~1.2GB)</option>';
+        if (flavour == 'small') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~550MB)</option>';
+        if (flavour == 'full') document.getElementById('download_arch').innerHTML = '<option value="amd64">64-bit PC (amd64)</option><option value="i386">32-bit PC (i686+)</option><option value="96">One for both (~1.2GB)</option>';
         update_links();
     }
 

diff --git a/static.inc b/static.inc
index 20d5b6d..d83034b 100644 (file)
--- a/static.inc
+++ b/static.inc
@@ -44,7 +44,7 @@
                 <a class="plain" href="/contact/">Contact</a><br/>
               </p>
 
-            <div class="copyright">&copy; Copyright 2003-2017 Grml Live Linux</div>
+            <div class="copyright">&copy; Copyright 2003-2018 Grml Live Linux</div>
             <p>&nbsp;</p>
 
       </div>