From owner-svn-doc-head@FreeBSD.ORG  Wed Jul 10 11:35:47 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B2B1C588;
 Wed, 10 Jul 2013 11:35:47 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9486E177F;
 Wed, 10 Jul 2013 11:35:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6ABZlTf011351;
 Wed, 10 Jul 2013 11:35:47 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6ABZl5q011350;
 Wed, 10 Jul 2013 11:35:47 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201307101135.r6ABZl5q011350@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 10 Jul 2013 11:35:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42235 -
 head/en_US.ISO8859-1/books/fdp-primer/docbook-markup
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 11:35:47 -0000

Author: wblock
Date: Wed Jul 10 11:35:47 2013
New Revision: 42235
URL: http://svnweb.freebsd.org/changeset/doc/42235

Log:
  Add a section showing use of <email> tags, both with and without
  "nolink".  Move the sample <procedure> inside the <example>, the
  comment that noted procedures could not be inside examples is no
  longer correct.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Wed Jul 10 10:38:06 2013	(r42234)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Wed Jul 10 11:35:47 2013	(r42235)
@@ -664,10 +664,7 @@
 	    <para>This is the second ordered item.</para>
 	  </listitem>
 	</orderedlist>
-      </example>
 
-      <!-- Cannot have <procedure> inside <example>, so this is a
-	cheat -->
 
       <procedure>
 	<step>
@@ -682,6 +679,7 @@
 	  <para>And now do this.</para>
 	</step>
       </procedure>
+      </example>
     </sect2>
 
     <sect2 id="docbook-markup-showing-file-samples">
@@ -1572,6 +1570,49 @@ This is the file called 'foo2'</screen>
       </example>
     </sect2>
 
+    <sect2 id="docbook-markup-email-addresses">
+      <title>Email Addresses</title>
+
+      <para>Email addresses are marked up with
+	<sgmltag>email</sgmltag> tags.  In the <acronym>HTML</acronym> 
+	output format, the wrapped text becomes a hyperlink to the
+	email address.  Other output formats that support hyperlinks
+	may also make the email address into a link.</para>
+
+      <example>
+	<title><sgmltag>email</sgmltag> with a Hyperlink</title>
+
+	<para>Usage:</para>
+
+	<programlisting><sgmltag class="starttag">para</sgmltag>Questions about &amp;os; may be sent to
+  <sgmltag class="starttag">email</sgmltag>questions@&amp;os;.org<sgmltag class="endtag">email</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
+
+	<para>Appearance:</para>
+
+	<para>Questions about &os; may be sent to
+	  <email>questions@&os;.org</email>.</para>
+      </example>
+
+      <para>A &os;-specific extension allows setting the
+	<literal>role</literal> attribute to <literal>nolink</literal>
+	to prevent the creation of the hyperlink to the email
+	address.</para>
+
+      <example>
+	<title><sgmltag>email</sgmltag> Without a Hyperlink</title>
+
+	<para>Usage:</para>
+
+	<programlisting><sgmltag class="starttag">para</sgmltag>Questions about &amp;os; may be sent to
+  <sgmltag class="starttag">email role="nolink"</sgmltag>questions@&amp;os;.org<sgmltag class="endtag">email</sgmltag>.<sgmltag class="endtag">para</sgmltag></programlisting>
+
+	<para>Appearance:</para>
+
+	<para>Questions about &os; may be sent to
+	  <email role="nolink">questions@&os;.org</email>.</para>
+      </example>
+    </sect2>
+
     <sect2 id="docbook-markup-describing-makefiles">
       <title>Describing <filename>Makefile</filename>s</title>