From owner-svn-doc-all@FreeBSD.ORG  Fri Jan 25 16:17:44 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4DE638E4;
 Fri, 25 Jan 2013 16:17:44 +0000 (UTC)
 (envelope-from eadler@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 404EC85D;
 Fri, 25 Jan 2013 16:17:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0PGHiRN035464;
 Fri, 25 Jan 2013 16:17:44 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0PGHhrY035463;
 Fri, 25 Jan 2013 16:17:43 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301251617.r0PGHhrY035463@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 25 Jan 2013 16:17:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40747 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Jan 2013 16:17:44 -0000

Author: eadler
Date: Fri Jan 25 16:17:43 2013
New Revision: 40747
URL: http://svnweb.freebsd.org/changeset/doc/40747

Log:
  Combine the questions on mailing lists and newgroups as they have nearly
  identical (non-)answers.
  
  Approved by:	bcr

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Fri Jan 25 14:27:47 2013	(r40746)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Fri Jan 25 16:17:43 2013	(r40747)
@@ -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>