Merge branch 'master' of github.com:archlinux32/website

1 files changed, 23 insertions, 15 deletions

diff --git a/download/index.html b/download/index.html
index 7b2718e..a8ce441 100644
--- a/download/index.html
+++ b/download/index.html
@@ -44,10 +44,10 @@
     can always be updated with <code>pacman -Syu</code>.</p>
 
     <ul>
-        <li><strong>Current Release:</strong> 2017.12.01</li>
-        <li><strong>Included Kernel:</strong> 4.13.12-1.1</li>
-        <li><strong>ISO Size (i686 only):</strong> 511.0 MB</li>
-        <li><strong>ISO Size (dual bootable):</strong> 956.0 MB</li>
+        <li><strong>Current Release:</strong> 2018.02.01</li>
+        <li><strong>Included Kernel:</strong> 4.14.13-1.0</li>
+        <li><strong>ISO Size (i686 only):</strong> 512.0 MB</li>
+        <li><strong>ISO Size (dual bootable):</strong> 981.0 MB</li>
     </ul>
 
     <h3>Existing Arch Users</h3>
@@ -64,7 +64,8 @@
     <ul>
         <li> Put any mirror from <a href="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist">our mirrolist</a>
              into <code>/etc/pacman.d/mirrorlist</code>.</li>
-        <li> Execute <code>pacman -Syy archlinux32-keyring-transition</code> to install our keyring transition package signed by one of the x86_64 archlinux devs.
+        <li> Execute <code>pacman -Syy archlinux32-keyring-transition</code> to install our keyring transition package signed by one of the x86_64 archlinux devs.</li>
+        <li> Execute <code>pacman -S archlinux32-keyring</code> to install our most recent keyring package.</li>
         <li> Run <code>pacman -Syuu</code> for a full transition.
             <ul>
                 <li> Note, that some packages are currently newer in the official repositories and will be downgraded, therefore.</li>
@@ -106,15 +107,15 @@ rlm.tyzoid.com%2Farchisos%2F&ws=https%3A%2F%2Fmirror.math.princeton.edu%2Fpub%2F
     <p>File integrity checksums for the latest releases can be found below:</p>
 
     <ul>
-        <li><a href="https://mirror.archlinux32.org/archisos/archlinux-2017.12.01-i686.iso.sig"
+        <li><a href="https://mirror.archlinux32.org/archisos/archlinux-2018.02.01-i686.iso.sig"
             title="PGP signature">PGP signature (i686 only)</a></li>
-        <li><a href="https://mirror.archlinux32.org/archisos/archlinux-2017.12.01-dual.iso.sig"
+        <li><a href="https://mirror.archlinux32.org/archisos/archlinux-2018.02.01-dual.iso.sig"
             title="PGP signature">PGP signature (dual bootable)</a></li>
         <li><strong>PGP Key:</strong> <a href="http://pgp.mit.edu/pks/lookup?search=0x248BF41F9BDD61D41D060AE774EDA3C6B06D0506&op=index">248BF41F9BDD61D41D060AE774EDA3C6B06D0506</a></li>
-        <li><strong>MD5 (i686 only):</strong> 3bab6f2b0595b9bd8953e9e0a0e06d33</li>
-        <li><strong>MD5 (dual bootable):</strong> 8e1cb3ed0668265098011f5c7b80e0eb</li>
-        <li><strong>SHA512 (i686 only):</strong> 5920d180d500a9516897a08f77faeaea637e11a0a81f5742bcfc4c23ca215d982c99683e6074ca7c9adae6c93544e808c9f3ee253f6b18cb91c50c5def900afc</li>
-        <li><strong>SHA512 (dual bootable):</strong> 5e331f0f93e63e9308b558912749adfab84e858c93d80c02fb2052c1e624fe647c7186a2e677e57fe82fb11a859fd4f2af9b472d958bee5f40d643a28cc94d72</li>
+        <li><strong>MD5 (i686 only):</strong> c208e40365be83d6922525930c15b220</li>
+        <li><strong>MD5 (dual bootable):</strong> 8d0ab1371cd7b1ea0b13e8910146ab2d</li>
+        <li><strong>SHA512 (i686 only):</strong> 8146b1b747d7993da5b1b584511c231014b30d1d069526c751900591ee28d6141aed7ea6eec9878b3127bbfdb49de73414d7366e1052e65821539cb1833e18ae</li>
+        <li><strong>SHA512 (dual bootable):</strong> ec37f73448d72c35ed1f6067be2da41db7cd5d016e1453e234150f3759e184ee8f00112d9983514925f077b2632e6453c4726544e54ec6d5c40bae63751a26d0</li>
     </ul>
 
     <div id="download-mirrors">
@@ -133,9 +134,7 @@ rlm.tyzoid.com%2Farchisos%2F&ws=https%3A%2F%2Fmirror.math.princeton.edu%2Fpub%2F
 
         <ul>
 
-            <li><a href="https://archlinux32.mirror.roelf.org/archisos/"
-                title="Download from https://archlinux32.mirror.roelf.org/">archlinux32.mirror.roelf.org</a></li>
-
+##Server = https://archlinux32.mirror.roelf.org/$arch/$repo
 
         </ul>
 
@@ -155,7 +154,13 @@ rlm.tyzoid.com%2Farchisos%2F&ws=https%3A%2F%2Fmirror.math.princeton.edu%2Fpub%2F
             <li><a href="https://mirror.archlinux32.org/archisos/"
                 title="Download from https://mirror.archlinux32.org/">mirror.archlinux32.org</a></li>
 
-# note: you need to resolve via openNIC (or similar) to access the next mirror
+
+        </ul>
+
+        <h5>note: you need to resolve via openNIC (or similar) to access the next mirror</h5>
+
+        <ul>
+
             <li><a href="http://mirror.archlinux32.oss/archisos/"
                 title="Download from http://mirror.archlinux32.oss/">mirror.archlinux32.oss</a></li>
 
@@ -209,6 +214,9 @@ rlm.tyzoid.com%2Farchisos%2F&ws=https%3A%2F%2Fmirror.math.princeton.edu%2Fpub%2F
             <li><a href="https://32.arlm.tyzoid.com/archisos/"
                 title="Download from https://32.arlm.tyzoid.com/">32.arlm.tyzoid.com</a></li>
 
+            <li><a href="https://mirror.math.princeton.edu/pub/archlinux32/archisos/"
+                title="Download from https://mirror.math.princeton.edu/pub/archlinux32/">mirror.math.princeton.edu</a></li>
+
         </ul>
 
     </div>