From 8f224d7fad6b8a95cb7c0f7ca2d0b5c74b107e6c Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 25 Jan 2013 16:17:43 +0000
Subject: [PATCH] Combine the questions on mailing lists and newgroups as they
 have nearly identical (non-)answers.

Approved by:	bcr
---
 en_US.ISO8859-1/books/faq/book.xml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index c8b3cc4436..7882048d90 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -963,22 +963,14 @@
 
       <qandaentry>
 	<question id="mailing">
-	  <para>Where do I find info on the &os; mailing lists?</para>
-	</question>
-
-	<answer>
-	  <para>You can find full information in the <ulink
-	      url="&url.books.handbook;/eresources.html#eresources-mail">Handbook entry on mailing-lists</ulink>.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-	<question id="newsgroups">
-	  <para>What &os; news groups are available?</para>
+	  <para>Where do I find info on the &os; mailing lists?
+	    What &os; news groups are available?</para>
 	</question>
 
 	<answer>
 	  <para>You can find full information in the <ulink
+	      url="&url.books.handbook;/eresources.html#eresources-mail">Handbook entry on mailing-lists</ulink>
+	    and the <ulink
 	      url="&url.books.handbook;/eresources-news.html">Handbook entry on newsgroups</ulink>.</para>
 	</answer>
       </qandaentry>