From 6a01746293ab29633758279754eadf76354dd930 Mon Sep 17 00:00:00 2001
From: Jim Perrin <jperrin@centos.org>
Date: Aug 19 2014 12:31:00 +0000
Subject: website updates


---

diff --git a/content/community/stories.md b/content/community/stories.md
index 20f5f43..99114ef 100644
--- a/content/community/stories.md
+++ b/content/community/stories.md
@@ -55,12 +55,12 @@ Security Architect at Rackspace but I'm still a big fan of CentOS for my
 personal projects.
 
 If you'd like to get in touch with me, find me on Twitter[1] or on IRC 
-(rackerhacker on Freenode).  I've made plenty of posts regarding CentOS, 
+(mhayden on Freenode).  I've made plenty of posts regarding CentOS, 
 Red Hat, and Fedora tips on my blog[2] and I maintain some Fedora/EPEL 
 packages[3] that may be of interest.
 
 1.  [http://twitter.com/majorhayden/](http://twitter.com/majorhayden/)
-2.  [http://rackerhacker.com/](http://rackerhacker.com/)
+2.  [http://major.io/](http://major.io/)
 3.  [https://admin.fedoraproject.org/pkgdb/users/packages/mhayden](https://admin.fedoraproject.org/pkgdb/users/packages/mhayden)
 
 ##Christoph Galuschka
diff --git a/content/download.haml b/content/download.haml
index ae318fd..2cb73ae 100644
--- a/content/download.haml
+++ b/content/download.haml
@@ -43,12 +43,12 @@ title: Download CentOS
     %h2.text-center Minimal Install Images
     %p 
       The absolute bare minimum no-frills install media for CentOS. For experienced users who don't need or want anything extra for their install. 
-      %a( href="http://wiki.centos.org/Manuals/ReleaseNotes/CentOSMinimalCD6.5" ) More Information &raquo;
+      %a( href="http://isoredirect.centos.org/centos/7/isos/x86_64/" ) Download the Minimal ISO &raquo;
   .col-sm-4
     %h2.text-center Older Versions
     %p  
       Legacy versions of CentOS are no longer supported. For historical purposes, CentOS keeps an archive of older versions. If you're absolutely sure you need an older version:
-      %a( href="http://vault.centos.org" ) then click here &raquo;
+      %a( href="http://wiki.centos.org/Download" ) then click here &raquo;
   .col-sm-4
     %h2.text-center Need the Source? 
     %p 
diff --git a/content/index.erb b/content/index.erb
index 607d4a3..42cded0 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -34,8 +34,9 @@ $(document).ready(function () {
       <a class="pull-left" href="#">
         <img class="media-object img-rounded" src="/images/centoslogo-32.png" width="32" alt="..."></a>
       <div class="media-body">
-        <h4 class="media-heading"><a href="http://www.oscon.com/oscon2014">CentOS at OSCON</a> <small><em>20-24 July 2014</em></small></h4>
-        <p>The CentOS Team will be at OSCON this year, with presentations and a table at the <a href="http://www.oscon.com/oscon2014/public/schedule/detail/35858">Open Cloud Poker Party</a> Come check us out </p>
+        <h4 class="media-heading"><a href="http://wiki.centos.org/Events/Dojo/Cologne2014">CentOS Dojo in Cologne, Germany</a> <small><em>8 Aug 2014</em></small></h4>
+        <p>Presentations include Container Orchestration, Docker, foreman and more. <a href="http://centosodjocologne2014.eventbrite.co.uk/">Register here</a> </p>
+	<p>Sponsored by <a href="http://www.inovex.de/">inovex</a></p>
         <p> <a href="http://wiki.centos.org/Events/Dojo/">More about Dojos and other Events</a></p>
       </div>
     </div>
@@ -44,8 +45,9 @@ $(document).ready(function () {
       <a class="pull-left" href="#">
         <img class="media-object img-rounded" src="/images/centoslogo-32.png" width="32" alt="..."></a>
       <div class="media-body">
-        <h4 class="media-heading"><a href="http://texaslinuxfest.org/">Texas LinuxFest</a> <small><em>13-14 June 2014</em></small></h4>
-        <p>Stop by our booth and say hi, ask questions, or let us know what you'd like to see. You could even get free stuff! </p>
+        <h4 class="media-heading"><a href="http://wiki.centos.org/Events/Dojo/Paris2014">CentOS Dojo in Paris, France</a> <small><em>25 Aug 2014</em></small></h4>
+        <p>Presentations include MariaDB, Vagrant, Firewalld, selinux and more. <a href="http://centosdojoparis2014.eventbrite.co.uk/">Register here</a> </p>
+	<p>Sponsored by <a href="http://www.zenika.com/">Zenica</a></p>
         <p> <a href="http://wiki.centos.org/Events/Dojo/">More about Dojos and other Events</a></p>
       </div>
     </div>
@@ -53,8 +55,9 @@ $(document).ready(function () {
       <a class="pull-left" href="#">
         <img class="media-object img-rounded" src="/images/centoslogo-32.png" width="32" alt="..."></a>
       <div class="media-body">
-        <h4 class="media-heading"><a href="http://wiki.centos.org/Events/Dojo/Cincinnati2014">CentOS Dojo - Cincinnati</a> <small><em>4 June 2014</em></small></h4>
-        <p>Come join the CentOS team in Cincinnati Ohio</p>
+        <h4 class="media-heading"><a href="http://wiki.centos.org/Events/Dojo/Barcelona2014">CentOS Dojo - Barcelona, Spain</a> <small><em>29 Oct 2014</em></small></h4>
+        <p>Come join the CentOS team in Barcelona</p>
+        <p>Sponsored by <a href="http://www.csuc.cat/">CSUC</a></p>
         <p> <a href="http://wiki.centos.org/Events/Dojo/">More about Dojos and other Events</a></p>
       </div>
     </div>
diff --git a/layouts/navbar.haml b/layouts/navbar.haml
index 676ecbc..258a6e1 100644
--- a/layouts/navbar.haml
+++ b/layouts/navbar.haml
@@ -56,6 +56,8 @@
               %a( href="http://wiki.centos.org" ) Wiki
             %li
               %a( href="/docs/" ) Manuals
+            %li
+              %a( href="/keys") GPG Key Info
 
         %li
           %a( href="http://wiki.centos.org/Documentation?action=show&redirect=GettingHelp" ) Help