btsmp: Put <none> in COL_INFO when having no keys

[metze/wireshark/wip.git] / README.linux

diff --git a/README.linux b/README.linux
index ad27953bbfc5db321b4c128b51403e00b0014c43..4e76629b7ef8fca8a364b9d9e2b1d4343787024e 100644 (file)
--- a/README.linux
+++ b/README.linux
@@ -1,6 +1,4 @@
-$Id$
-
-In order to capture packets (with Ethereal/TShark, tcpdump, or any
+In order to capture packets (with Wireshark/TShark, tcpdump, or any
 other libpcap-based packet capture program) on a Linux system, the
 "packet" protocol must be supported by your kernel.  If it is not, you
 may get error messages such as
@@ -13,9 +11,11 @@ in "/var/adm/messages", or may get messages such as
 
 from applications using libpcap.
 
-You must configure the kernel with the CONFIG_PACKET option for this
-protocol; the following note is from the Linux "Configure.help" file for
-the 2.0[.x] kernel:
+Most recent Linux distributions will have this configured in by default. 
+If it is not configured in with the default kernel, and if it is not a
+module loaded by default, you must configure the kernel with the
+CONFIG_PACKET option for this protocol; the following note is from the
+Linux "Configure.help" file for the 2.0[.x] kernel:
 
        Packet socket
        CONFIG_PACKET
@@ -59,8 +59,10 @@ significant number of packets.  (If no filter is specified, it makes no
 difference whether the filtering isn't performed in the kernel or isn't
 performed in user mode. :-))
 
-The option for this is the CONFIG_FILTER option; the "Configure.help"
-file says:
+Most recent Linux distributions will have this configured in by default. 
+If it is not configured in with the default kernel, you must configure
+the kernel with the CONFIG_FILTER option; the "Configure.help" file
+says:
 
        Socket filtering
        CONFIG_FILTER
@@ -83,13 +85,13 @@ distribution releases will not have this problem.
 In addition, older versions of libpcap will, on Linux systems with a
 2.0[.x] kernel, or if built for systems with a 2.0[.x] kernel, not turn
 promiscuous mode off on a network device until the program using
-promiscuous mode exits, so if you start a capture with Ethereal on some
+promiscuous mode exits, so if you start a capture with Wireshark on some
 Linux distributions, the network interface will be put in promiscuous
-mode and will remain in promiscuous mode until Ethereal exits.  There
+mode and will remain in promiscuous mode until Wireshark exits.  There
 might be additional libpcap bugs that cause it not to be turned off even
-when Ethereal exits; if your network is busy, this could cause the Linux
+when Wireshark exits; if your network is busy, this could cause the Linux
 networking stack to do a lot more work discarding packets not intended
-for the machine, so you may want to check, after running Ethereal,
+for the machine, so you may want to check, after running Wireshark,
 whether any network interfaces are in promiscuous mode (the output of
 "ifconfig -a" will say something such as