Update previews

27 files changed, 92 insertions, 72 deletions

diff --git a/html/capabilities.html b/html/capabilities.html
index 6e8fa7a..796046d 100644
--- a/html/capabilities.html
+++ b/html/capabilities.html
@@ -409,7 +409,7 @@ set of distinct privileges
 <tr><td align="left" class="topsep"><p class="alttext">
 	<a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Author</i><br><br>
-	Adam Mondl
+	<a href="mailto:tocharian@gentoo.org" class="altlink"><b>Adam Mondl</b></a>
 <br><i>Contributor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/docs/devel-chroots-intro.html b/html/docs/devel-chroots-intro.html
index f7606e5..130c11d 100644
--- a/html/docs/devel-chroots-intro.html
+++ b/html/docs/devel-chroots-intro.html
@@ -446,7 +446,7 @@ This guide covers the installation, configuration and set up
 of chroots using a tool developed for the Gentoo dev machines.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:a.gabert@fh-trier.de" class="altlink"><b>Alexander Gabert</b></a>
+  <a href="mailto:pappy@gentoo.org" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Author</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/docs/glossary.html b/html/docs/glossary.html
index 018e6f5..5e60a81 100644
--- a/html/docs/glossary.html
+++ b/html/docs/glossary.html
@@ -147,7 +147,7 @@ This document introduces the Gentoo Hardened project and covers
 each of its subprojects in simple terms.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:brandon@inclusivetech.net" class="altlink"><b>Brandon Hale</b></a>
+  <a href="mailto:tseng@gentoo.org" class="altlink"><b>Brandon Hale</b></a>
 <br><i>Author</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/docs/pax-howto.html b/html/docs/pax-howto.html
index a515906..e2009d8 100644
--- a/html/docs/pax-howto.html
+++ b/html/docs/pax-howto.html
@@ -252,7 +252,7 @@ to run.
 A quickstart covering PaX and Hardened Gentoo.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:brandon@inclusivetech.net" class="altlink"><b>Brandon Hale</b></a>
+  <a href="mailto:tseng@gentoo.org" class="altlink"><b>Brandon Hale</b></a>
 <br><i>Author</i><br><br>
   <a href="mailto:blackace@gentoo.org" class="altlink"><b>Blackace</b></a>
 <br><i>Editor</i><br></p></td></tr>
diff --git a/html/etdyn.html b/html/etdyn.html
index 0affe42..99ea501 100644
--- a/html/etdyn.html
+++ b/html/etdyn.html
@@ -190,11 +190,11 @@ These guidelines are required to achieve full Address Space Layout Randomization
 <br><i>Author</i><br><br>
 	<a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Contributor</i><br><br>
-	<a href="mailto:a.gabert@fh-trier.de" class="altlink"><b>Alexander Gabert</b></a>
+	<a href="mailto:pappy@gentoo.org" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Contributor</i><br><br>
-	<a href="mailto:john_davis@pauldavisautomation.com" class="altlink"><b>John Davis</b></a>
+	<a href="mailto:zhen@gentoo.org" class="altlink"><b>John Davis</b></a>
 <br><i>Editor</i><br><br>
-	Zack Gilburd
+	<a href="mailto:klasikahl@gentoo.org" class="altlink"><b>Zack Gilburd</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/gnu-stack.html b/html/gnu-stack.html
index b402213..fd6caf0 100644
--- a/html/gnu-stack.html
+++ b/html/gnu-stack.html
@@ -406,7 +406,7 @@ If no one can seem to answer your question, give me a poke either on irc
 <br><i>Author</i><br><br>
  <a href="mailto:pageexec@freemail.hu" class="altlink"><b>The PaX team</b></a>
 <br><i>Contributor</i><br><br>
- <a href="mailto:g2@kevquinn.com" class="altlink"><b>Kevin F. Quinn</b></a>
+ <a href="mailto:kevquinn@gentoo.org" class="altlink"><b>Kevin F. Quinn</b></a>
 <br><i>Contributor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/hardened-toolchain.html b/html/hardened-toolchain.html
index 4c6c57d..7fefc3c 100644
--- a/html/hardened-toolchain.html
+++ b/html/hardened-toolchain.html
@@ -334,7 +334,7 @@ The following packages have issues with BIND_NOW at the time of writing, and it
 Technical description of, and rationale for, the Gentoo Hardened Toolchain modifications.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-<a href="mailto:g2@kevquinn.com" class="altlink"><b>Kevin F. Quinn</b></a>
+<a href="mailto:kevquinn@gentoo.org" class="altlink"><b>Kevin F. Quinn</b></a>
 <br><i>Author</i><br><br>
 <a href="mailto:solar@gentoo.org" class="altlink"><b>Ned Ludd</b></a>
 <br><i>Contributor</i><br><br>
diff --git a/html/hardenedfaq.html b/html/hardenedfaq.html
index e205b49..5658af4 100644
--- a/html/hardenedfaq.html
+++ b/html/hardenedfaq.html
@@ -543,11 +543,11 @@ Frequently Asked Questions that arise on the #gentoo-hardened IRC channel and
 the gentoo-hardened mailing list.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  Adam Mondl
+  <a href="mailto:tocharian@gentoo.org" class="altlink"><b>Adam Mondl</b></a>
 <br><i>Author</i><br><br>
   <a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Contributor</i><br><br>
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Contributor</i><br><br>
   <a href="mailto:pageexec@freemail.hu" class="altlink"><b>The PaX Team</b></a>
 <br><i>Contributor</i><br><br>
diff --git a/html/hardenedxorg.html b/html/hardenedxorg.html
index d88a199..3480e67 100644
--- a/html/hardenedxorg.html
+++ b/html/hardenedxorg.html
@@ -123,13 +123,13 @@ The PaX flags -P (PAGEEXEC), -S (SEGMEXEC), -M (MPROTECT) as well as -R (RANDMMA
 How to install and use Xorg on Hardened Gentoo
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  Adam Mondl
+  <a href="mailto:tocharian@gentoo.org" class="altlink"><b>Adam Mondl</b></a>
 <br><i>Author</i><br><br>
-  <a href="mailto:g2@kevquinn.com" class="altlink"><b>Kevin Quinn</b></a>
+  <a href="mailto:kevquinn@gentoo.org" class="altlink"><b>Kevin Quinn</b></a>
 <br><i>Contributor</i><br><br>
   <a href="mailto:solar@gentoo.org" class="altlink"><b>Ned Ludd</b></a>
 <br><i>Contributor</i><br><br>
-  <a href="mailto:christian.heim@uni-greifswald.de" class="altlink"><b>Christian Heim</b></a>
+  <a href="mailto:phreak@gentoo.org" class="altlink"><b>Christian Heim</b></a>
 <br><i>Contributor</i><br><br>
   <a href="mailto:zaid_a@users.sourceforge.net" class="altlink"><b>Zaid A.</b></a>
 <br><i>Contributor</i><br></p></td></tr>
diff --git a/html/index.html b/html/index.html
index 4d041f6..9f5561b 100644
--- a/html/index.html
+++ b/html/index.html
@@ -56,42 +56,42 @@ Gentoo once they've been tested for security and stability by the Hardened team.
             <td class="infohead"><b>Role</b></td>
           </tr>
           <tr>
-            <td class="tableinfo">Tony Vroon</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">chainsaw</td>
             <td class="tableinfo">Member ( Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Bryan Stine</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">battousai</td>
             <td class="tableinfo">Member ( Bastille Lead )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">blueness</td>
             <td class="tableinfo">Member ( PaX/Grsecurity, Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Gordon Malm</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">gengor</td>
             <td class="tableinfo">Member ( PaX/Grsecurity, Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Gysbert Wassenaar</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">nixnut</td>
             <td class="tableinfo">Member ( PPC arch team liaison )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">pebenito</td>
             <td class="tableinfo">Member ( SELinux )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Matthew Summers</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">quantumsummers</td>
             <td class="tableinfo">Member ( Hardened sources, Doc )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Magnus Granberg</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">zorry</td>
             <td class="tableinfo">Project Lead ( Hardened Toolchain, Doc )</td>
           </tr>
@@ -142,12 +142,12 @@ project:
             <td class="tableinfo">
               <a href="selinux/index.html">SELinux</a>
             </td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">SELinux is a system of mandatory access controls. SELinux can enforce the security policy over all processes and objects in the system.</td>
           </tr>
           <tr>
             <td class="tableinfo">PaX/Grsecurity</td>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo">blueness</td>
             <td class="tableinfo">
 Grsecurity is a complete security solution providing such features as a MAC or
 RBAC system, chroot restrictions, address space modification protection (via
@@ -157,7 +157,7 @@ file race conditions, ipc protections and much more.
           </tr>
           <tr>
             <td class="tableinfo">Hardened Toolchain</td>
-            <td class="tableinfo">Magnus Granberg</td>
+            <td class="tableinfo">Zorry</td>
             <td class="tableinfo">
 Transparent implementation of
 <a href="http://pax.grsecurity.net/docs/aslr.txt">PaX</a> address space
@@ -167,7 +167,7 @@ executables.
           </tr>
           <tr>
             <td class="tableinfo">Hardened Kernel Sources</td>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo">blueness</td>
             <td class="tableinfo">
 A kernel which provides patches for hardened subprojects, and stability/security
 oriented patches. Includes Grsecurity and SELinux.
@@ -175,7 +175,7 @@ oriented patches. Includes Grsecurity and SELinux.
           </tr>
           <tr>
             <td class="tableinfo">Bastille</td>
-            <td class="tableinfo">Bryan Stine</td>
+            <td class="tableinfo">battousai</td>
             <td class="tableinfo">
 Bastille is an interactive application which gives the user suggestions on
 securing their machine. It will be customized to make suggestions about other
@@ -271,9 +271,6 @@ GNU Stack Quickstart
               <li>
                 <a href="selinux/selinux-handbook.html">Gentoo SELinux Handbook</a>
               </li>
-              <li>
-                <a href="selinux-faq.html">Gentoo SELinux FAQ</a>
-              </li>
             </ul>
           </li>
         </ul>
diff --git a/html/index2.html b/html/index2.html
index 44ea154..883f517 100644
--- a/html/index2.html
+++ b/html/index2.html
@@ -55,37 +55,37 @@ Gentoo once they've been tested for security and stability by the Hardened team.
             <td class="infohead"><b>Role</b></td>
           </tr>
           <tr>
-            <td class="tableinfo">Tony Vroon</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">chainsaw</td>
             <td class="tableinfo">Member ( Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Bryan Stine</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">battousai</td>
             <td class="tableinfo">Member ( Bastille Lead )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">blueness</td>
             <td class="tableinfo">Member ( PaX/Grsecurity, Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Gordon Malm</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">gengor</td>
             <td class="tableinfo">Member ( PaX/Grsecurity, Hardened sources )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Gysbert Wassenaar</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">nixnut</td>
             <td class="tableinfo">Member ( PPC arch team liaison )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Matthew Summers</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">quantumsummers</td>
             <td class="tableinfo">Member ( Hardened sources, Doc )</td>
           </tr>
           <tr>
-            <td class="tableinfo">Magnus Granberg</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">zorry</td>
             <td class="tableinfo">Project Lead ( Hardened Toolchain, Doc )</td>
           </tr>
@@ -102,7 +102,7 @@ Gentoo once they've been tested for security and stability by the Hardened team.
             <td class="tableinfo">Policy development, Proxy (non developer contributors)</td>
           </tr>
           <tr>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">pebenito</td>
             <td class="tableinfo">Lead ( Policy, x86, AMD64 )</td>
           </tr>
@@ -125,12 +125,12 @@ Gentoo once they've been tested for security and stability by the Hardened team.
             <td class="tableinfo">
               <a href="selinux/index.html">SELinux</a>
             </td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">SELinux is a system of mandatory access controls. SELinux can enforce the security policy over all processes and objects in the system.</td>
           </tr>
           <tr>
             <td class="tableinfo">PaX/Grsecurity</td>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo">blueness</td>
             <td class="tableinfo">
 Grsecurity is a complete security solution providing such features as a MAC or
 RBAC system, Chroot restrictions, address space modification protection (via
@@ -140,7 +140,7 @@ file race conditions, ipc protections and much more.
           </tr>
           <tr>
             <td class="tableinfo">Hardened Toolchain</td>
-            <td class="tableinfo">Magnus Granberg</td>
+            <td class="tableinfo">Zorry</td>
             <td class="tableinfo">
 Transparent implementation of
 <a href="http://pax.grsecurity.net/docs/aslr.txt">PaX</a> address space
@@ -150,7 +150,7 @@ executables.
           </tr>
           <tr>
             <td class="tableinfo">Hardened-Sources</td>
-            <td class="tableinfo">Anthony G. Basile</td>
+            <td class="tableinfo">blueness</td>
             <td class="tableinfo">
 A kernel which provides patches for hardened subprojects, and stability/security
 oriented patches. Includes Grsecurity and SELinux.
@@ -158,7 +158,7 @@ oriented patches. Includes Grsecurity and SELinux.
           </tr>
           <tr>
             <td class="tableinfo">Bastille</td>
-            <td class="tableinfo">Bryan Stine</td>
+            <td class="tableinfo">battousai</td>
             <td class="tableinfo">
 Bastille is an interactive application which gives the user suggestions on
 securing their machine. It will be customized to make suggestions about other
@@ -240,9 +240,6 @@ GNU Stack Quickstart</a>
               <li>
                 <a href="selinux/selinux-handbook.html">Gentoo SELinux Handbook</a>
               </li>
-              <li>
-                <a href="selinux-faq.html">Gentoo SELinux FAQ</a>
-              </li>
             </ul>
           </li>
         </ul>
diff --git a/html/pax-quickstart.html b/html/pax-quickstart.html
index 3cef2d4..ad3fc1b 100644
--- a/html/pax-quickstart.html
+++ b/html/pax-quickstart.html
@@ -257,7 +257,7 @@ to run. Often we find that we need the -m -sp combos.
 A quickstart covering PaX and Hardened Gentoo.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:brandon@inclusivetech.net" class="altlink"><b>Brandon Hale</b></a>
+  <a href="mailto:tseng@gentoo.org" class="altlink"><b>Brandon Hale</b></a>
 <br><i>Author</i><br><br>
   <a href="mailto:blackace@gentoo.org" class="altlink"><b>Blackace</b></a>
 <br><i>Editor</i><br><br>
diff --git a/html/pax-utils.html b/html/pax-utils.html
index a62c2d4..2fda7fd 100644
--- a/html/pax-utils.html
+++ b/html/pax-utils.html
@@ -670,11 +670,11 @@ This guide provides instruction on securing your system by using the pax-utils
 package to find and identify problematic binaries.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:sven.vermeulen@siphos.be" class="altlink"><b>Sven Vermeulen</b></a>
+  <a href="mailto:swift@gentoo.org" class="altlink"><b>swift</b></a>
 <br><i>Author</i><br><br>
-  <a href="mailto:solar@gentoo.org" class="altlink"><b>Ned Ludd</b></a>
+  <a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Editor</i><br><br>
-  <a href="mailto:nightmorph@gentoo.org" class="altlink"><b>Joshua Saddler</b></a>
+  <a href="mailto:nightmorph@gentoo.org" class="altlink"><b>nightmorph</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/pic-fix-guide.html b/html/pic-fix-guide.html
index eef91a5..c27137d 100644
--- a/html/pic-fix-guide.html
+++ b/html/pic-fix-guide.html
@@ -858,7 +858,7 @@ mmx32_rgb888_mask dd 00ffffffh,00ffffffh
 <br><i>Author</i><br><br>
  <a href="mailto:pageexec@freemail.hu" class="altlink"><b>The PaX team</b></a>
 <br><i>Contributor</i><br><br>
- <a href="mailto:g2@kevquinn.com" class="altlink"><b>Kevin F. Quinn</b></a>
+ <a href="mailto:kevquinn@gentoo.org" class="altlink"><b>Kevin F. Quinn</b></a>
 <br><i>Contributor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/pic-guide.html b/html/pic-guide.html
index fce32be..00b2ff7 100644
--- a/html/pic-guide.html
+++ b/html/pic-guide.html
@@ -156,7 +156,7 @@ References:
 <tr><td align="left" class="topsep"><p class="alttext">
  <a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Author</i><br><br>
- <a href="mailto:a.gabert@fh-trier.de" class="altlink"><b>Alexander Gabert</b></a>
+ <a href="mailto:pappy@gentoo.org" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/pic-internals.html b/html/pic-internals.html
index b7c9ef3..aeded3e 100644
--- a/html/pic-internals.html
+++ b/html/pic-internals.html
@@ -226,7 +226,7 @@ These executables simply do not need the PIC addressing mode for their functions
 <tr><td class="topsep" align="center"><p class="alttext">Updated February 14, 2004</p></td></tr>
 <tr><td class="topsep" align="left"><p class="alttext"><b>Summary: </b>Understanding the impact of text relocations and explaining the use of PIC in shared libraries</p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
- <a href="mailto:a.gabert@fh-trier.de" class="altlink"><b>Alexander Gabert</b></a>
+ <a href="mailto:pappy@gentoo.org" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Author</i><br><br>
  <a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Contributor</i><br><br>
diff --git a/html/pie-ssp.html b/html/pie-ssp.html
index f9d7069..4009ff2 100644
--- a/html/pie-ssp.html
+++ b/html/pie-ssp.html
@@ -216,7 +216,7 @@ glibc-based SSP setup for userland in GNU/Linux for Gentoo-Linux at all!
 <p class="chaphead"><a name="doc_chap6"></a><span class="chapnum">6.
             </span>Using distcc with hgcc</p>
 <p>
-Lisa Marie Seelye says you need the same hgcc and gcc versions on all distcc host volunteer machines.
+<a href="mailto:lisa@gentoo.org">Lisa Marie Seelye</a> says you need the same hgcc and gcc versions on all distcc host volunteer machines.
 </p>
 <p class="chaphead"><a name="doc_chap7"></a><span class="chapnum">7.
             </span>Credits and Reference</p>
@@ -237,7 +237,7 @@ Lisa Marie Seelye says you need the same hgcc and gcc versions on all distcc hos
 <tr><td class="topsep" align="center"><p class="alttext">Updated November 27, 2010</p></td></tr>
 <tr><td class="topsep" align="left"><p class="alttext"><b>Summary: </b>(This DOC is badly outdated and mostly obsolete) This introductionary guide explains the basic behaviour of the hardened toolchain.</p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-        <a href="mailto:a.gabert@fh-trier.de" class="altlink"><b>Alexander Gabert</b></a>
+        <a href="mailto:pappy@gentoo.org" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Author</i><br><br>
 	<a href="mailto:solar@gentoo.org" class="altlink"><b>solar</b></a>
 <br><i>Contributor</i><br></p></td></tr>
diff --git a/html/prelude-ids.html b/html/prelude-ids.html
index e1f0acc..65bd9ba 100644
--- a/html/prelude-ids.html
+++ b/html/prelude-ids.html
@@ -603,7 +603,7 @@ $conf{'dbpasswd'}='dbpass';
 <tr><td align="left" class="topsep"><p class="alttext"><a href="mailto:zack@tehunlose.com" class="altlink"><b>
 	Zack Gilburd</b></a>
 <br><i>Author</i><br><br>
-  <a href="mailto:michael.boman@gmail.com" class="altlink"><b>Michael Boman</b></a>
+  <a href="mailto:mboman@gentoo.org" class="altlink"><b>Michael Boman</b></a>
 <br><i>Contributors</i><br><br>
   <a href="mailto:kzaraska@student.uci.agh.edu.pl" class="altlink"><b>Krzysztof Zaraska</b></a>
 <br><i>Contributors</i><br></p></td></tr>
diff --git a/html/primer.html b/html/primer.html
index 598463b..3d48453 100644
--- a/html/primer.html
+++ b/html/primer.html
@@ -251,9 +251,9 @@
 <tr><td class="topsep" align="center"><p class="alttext">Updated February 7, 2007</p></td></tr>
 <tr><td class="topsep" align="left"><p class="alttext"><b>Summary: </b>A Primer on Hardened Gentoo.</p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-    <a href="mailto:method@manicmethod.com" class="altlink"><b>Joshua Brindle</b></a>
+    <a href="mailto:method@gentoo.org" class="altlink"><b>Joshua Brindle</b></a>
   <br><i>Author</i><br><br>
-    Adam Mondl
+    <a href="mailto:tocharian@gentoo.org" class="altlink"><b>Adam Mondl</b></a>
   <br><i>Contributor</i><br><br>
     <a href="mailto:solar@gentoo.org" class="altlink"><b>Ned Ludd</b></a>
   <br><i>Editor</i><br></p></td></tr>
diff --git a/html/roadmap.html b/html/roadmap.html
index 235b2ff..e2d38b8 100644
--- a/html/roadmap.html
+++ b/html/roadmap.html
@@ -405,17 +405,17 @@ A roadmap that plots current needs and goals of the
 Hardened Gentoo project.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  Adam Mondl
+  <a href="mailto:tocharian@gentoo.org" class="altlink"><b>Adam Mondl</b></a>
 <br><i>Author</i><br><br>
-  Rob Holland
+  <a href="mailto:tigger@gentoo.org" class="altlink"><b>Rob Holland</b></a>
 <br><i>Editor</i><br><br>
   <a href="mailto:solar@gentoo.org" class="altlink"><b>Ned Ludd</b></a>
 <br><i>Contributor</i><br><br>
   <a href="mailto:pebenito@gentoo.org" class="altlink"><b>Chris PeBenito</b></a>
 <br><i>Contributor</i><br><br>
-  <a href="mailto:method@manicmethod.com" class="altlink"><b>Joshua Brindle</b></a>
+  <a href="mailto:method@gentoo.org" class="altlink"><b>Joshua Brindle</b></a>
 <br><i>Contributor</i><br><br>
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Contributor</i><br><br>
   <a href="mailto:pappy@retired" class="altlink"><b>Alexander Gabert</b></a>
 <br><i>Contributor</i><br><br>
diff --git a/html/rsbac/intro.html b/html/rsbac/intro.html
index b34e684..8c6dc2b 100644
--- a/html/rsbac/intro.html
+++ b/html/rsbac/intro.html
@@ -94,7 +94,7 @@ access control system.	</p></td></tr>
 <br><i>Author</i><br><br>
   <a href="mailto:albeiro@gentoo.pl" class="altlink"><b>Michal Purzynski</b></a>
 <br><i>Editor</i><br><br>
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/rsbac/overview.html b/html/rsbac/overview.html
index 01ec2f3..3922ec8 100644
--- a/html/rsbac/overview.html
+++ b/html/rsbac/overview.html
@@ -206,7 +206,7 @@ This document should give you an overview of RSBAC access control system.
 <br><i>Author</i><br><br> 
   <a href="mailto:albeiro@gentoo.pl" class="altlink"><b>Michal Purzynski</b></a>
 <br><i>Editor</i><br><br>
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/rsbac/quickstart.html b/html/rsbac/quickstart.html
index e9430ff..6045dcb 100644
--- a/html/rsbac/quickstart.html
+++ b/html/rsbac/quickstart.html
@@ -334,7 +334,7 @@ RSBAC on Gentoo Linux</p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
   <a href="mailto:albeiro@gentoo.pl" class="altlink"><b>Michal Purzynski</b></a>
 <br><i>Author</i><br><br>
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Editor</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/rsbac/transition.html b/html/rsbac/transition.html
index d05ac31..725616c 100644
--- a/html/rsbac/transition.html
+++ b/html/rsbac/transition.html
@@ -71,7 +71,7 @@ Transition from rsbac-sources to hardened-sources </h1>
 <tr><td class="topsep" align="left"><p class="alttext"><b>Summary: </b> This document will help you transioning from
 rsbac-sources to hardened-sources </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-  <a href="mailto:kang@insecure.ws" class="altlink"><b>Guillaume Destuynder</b></a>
+  <a href="mailto:kang@gentoo.org" class="altlink"><b>Guillaume Destuynder</b></a>
 <br><i>Author</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.
diff --git a/html/selinux-faq.html b/html/selinux-faq.html
index 416b89b..9dc1bfb 100644
--- a/html/selinux-faq.html
+++ b/html/selinux-faq.html
@@ -67,6 +67,7 @@ as well.
   During package installation, ld.so complains 'object 'libsandbox.so' from 
   LD_PRELOAD cannot be preloaded: ignored'
 </a></li>
+<li><a href="#emergefails">Emerge does not work, giving 'Permission denied: /etc/make.conf'</a></li>
 </ul>
 <p class="chaphead"><a name="doc_chap2"></a><span class="chapnum">2.
             </span>General SELinux Support Questions</p>
@@ -311,6 +312,31 @@ just merged.
 So the error is in our opinion cosmetic and can be ignored (but sadly not
 hidden).
 </p>
+<p class="secthead"><a name="emergefails"></a><a name="doc_chap5_sect5">Emerge does not work, giving 'Permission denied: /etc/make.conf'</a></p>
+<p>
+This is to be expected if you are not using the <span class="code" dir="ltr">sysadm_r</span> role. Any
+Portage related activity requires that you are in the <span class="code" dir="ltr">sysadm_r</span> role. To
+transition to the role, first validate if you are currently known as
+<span class="code" dir="ltr">staff_u</span> (or, if you added your own SELinux identities, a user that has
+the permission to transition to the <span class="code" dir="ltr">sysadm_r</span> role). Then run <span class="code" dir="ltr">newrole
+-r sysadm_r</span> to transition.
+</p>
+<a name="doc_chap5_pre6"></a><table class="ntable" width="100%" cellspacing="0" cellpadding="0" border="0">
+<tr><td bgcolor="#7a5ada"><p class="codetitle">Code Listing5.6: Transitioning to sysadm_r</p></td></tr>
+<tr><td bgcolor="#eeeeff" align="left" dir="ltr"><pre>
+~$ <span class="code-input">emerge --info</span>
+Permission denied: '/etc/make.conf'
+~$ <span class="code-input">id -Z</span>
+staff_u:staff_r:staff_t
+~$ <span class="code-input">newrole -r sysadm_r</span>
+Password: <span class="code-comment"># Enter your users' password</span>
+</pre></td></tr>
+</table>
+<p>
+This is also necessary if you logged on to your system as root but through SSH.
+The default behavior is that SSH sets the lowest role for the particular user
+when logged on. And you shouldn't allow remote root logins anyhow.
+</p>
 <br><br>
 </td>
 <td width="1%" bgcolor="#dddaec" valign="top"><table border="0" cellspacing="4px" cellpadding="4px">
diff --git a/html/selinux/index.html b/html/selinux/index.html
index 6876a9c..e1de71a 100644
--- a/html/selinux/index.html
+++ b/html/selinux/index.html
@@ -71,7 +71,7 @@
             <td class="infohead"><b>Role</b></td>
           </tr>
           <tr>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo"></td>
             <td class="tableinfo">pebenito</td>
             <td class="tableinfo">Lead ( Policy, x86, AMD64 )</td>
           </tr>
@@ -121,7 +121,7 @@ project:
           </tr>
           <tr>
             <td class="tableinfo">Base Policy</td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">
   SELinux policy for the core system, including users, administrators, and
   daemons in the system profile.
@@ -129,21 +129,21 @@ project:
           </tr>
           <tr>
             <td class="tableinfo">Daemon Policy</td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">
   SELinux policies for common daemons.
 </td>
           </tr>
           <tr>
             <td class="tableinfo">x86</td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">
   Support for the x86 architecture.
 </td>
           </tr>
           <tr>
             <td class="tableinfo">AMD64</td>
-            <td class="tableinfo">Chris PeBenito</td>
+            <td class="tableinfo">pebenito</td>
             <td class="tableinfo">
   Support for the AMD64 (x86-64) architecture.
 </td>
diff --git a/html/toolchain-upgrade-guide.html b/html/toolchain-upgrade-guide.html
index aac017e..4229402 100644
--- a/html/toolchain-upgrade-guide.html
+++ b/html/toolchain-upgrade-guide.html
@@ -261,7 +261,7 @@ Technical Description of the Gentoo Hardened Toolchain</a></li>
 Guide for upgrading from hardened gcc-3/glibc-2.3/binutils-2.16 to gcc-4/glibc-2.5/binutils-2.17.
 </p></td></tr>
 <tr><td align="left" class="topsep"><p class="alttext">
-<a href="mailto:g2@kevquinn.com" class="altlink"><b>Kevin F. Quinn</b></a>
+<a href="mailto:kevquinn@gentoo.org" class="altlink"><b>Kevin F. Quinn</b></a>
 <br><i>Author</i><br></p></td></tr>
 <tr lang="en"><td align="center" class="topsep">
 <p class="alttext"><b>Donate</b> to support our development efforts.