Merge the projects/entities branch into head/

The primary purposes are to clean up duplicated author definitions in
both share/xml/authors.ent and share/xml/developers.ent, and as a added
bonus simplify writing up author names/email addresses in web pages.

Apart from merging developers.ent into authors.ent, removing the former,
and updating the Committers Guide there should be little user-visible changes:
- a.portmgr renamed to a.portmgr.members
- a.doceng renamed to a.doceng.members
- team.re renamed to a.re.members.email and moved from
share/xml/freebsd.ent to share/xml/authors.ent
- a.core updated and moved from share/xml/mailing-lists.ent to
share/xml/teams.ent
- share/pgpkeys/{addkey.sh|README} updated

Translations are untouched except for build fixes.

Approved by:	doceng (gjb)
Approved by:	gjb (mentor)

1 files changed, 30 insertions, 0 deletions

diff --git a/share/xsl/freebsd-xhtml-common.xsl b/share/xsl/freebsd-xhtml-common.xsl
index b8fbe90777..0a3db4ec30 100644
--- a/share/xsl/freebsd-xhtml-common.xsl
+++ b/share/xsl/freebsd-xhtml-common.xsl
@@ -74,6 +74,36 @@
     <xsl:value-of select="."/>
   </xsl:template>
 
+  <!-- Customization to allow role="nolink" -->
+  <xsl:template match="email">
+    <xsl:call-template name="inline.monoseq">
+      <xsl:with-param name="content">
+	<xsl:if test="not($email.delimiters.enabled = 0)">
+	  <xsl:text>&lt;</xsl:text>
+	</xsl:if>
+	<xsl:choose>
+	  <xsl:when test="@role='nolink'">
+	    <xsl:apply-templates/>
+	  </xsl:when>
+
+	  <xsl:otherwise>
+	    <a>
+	      <xsl:apply-templates select="." mode="common.html.attributes"/>
+	      <xsl:attribute name="href">
+		<xsl:text>mailto:</xsl:text>
+		<xsl:value-of select="."/>
+	      </xsl:attribute>
+	      <xsl:apply-templates/>
+	    </a>
+	  </xsl:otherwise>
+	</xsl:choose>
+	<xsl:if test="not($email.delimiters.enabled = 0)">
+	  <xsl:text>&gt;</xsl:text>
+	</xsl:if>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+
   <!-- Add title class to emitted hX -->
   <xsl:template match="bridgehead">
     <xsl:variable name="container" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|