From 19b6883704c8674690ed8fb821041cd509c4b1d7 Mon Sep 17 00:00:00 2001
From: gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 17 Jun 2011 17:52:31 +0000
Subject: Make pcap-ng the default. Add a compile-time option to prefer pcap-ng
 or pcap.  Add a "-P" capture option which tries to use pcap instead of
 pcap-ng ("-P" seemed to be the best option but we may want to use a different
 letter).

Update the documentation and release notes.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37696 f5534014-38df-0310-8fa8-9805f1628bb7
---
 docbook/release-notes.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'docbook')

diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index a14314eec5..a5915e0935 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -63,7 +63,23 @@ Wireshark Info
 
         <listitem>
           <para>
-            <!-- -->
+            Wireshark supports capturing from multiple interfaces at once.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Wireshark, TShark, and their associated utilities now save files
+	    using the pcap-ng file format by default. (Your copy of Wireshark
+	    might still use the pcap file format if pcap-ng is disabled in
+	    your preferences.)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Decryption key management for IEEE 802.11, IPsec, and ISAKMP
+	    is now easier.
           </para>
         </listitem>
 
-- 
cgit v1.2.3