From bf305c1476f40cc422b9b33aa431bc75756d58f9 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 23 Mar 2011 21:03:18 +0000
Subject: Clean up information about older Windows versions.

svn path=/trunk/; revision=36300
---
 docbook/wsug_src/WSUG_app_files.xml            | 29 ++++++++++++++++++--------
 docbook/wsug_src/WSUG_chapter_introduction.xml |  8 ++++++-
 2 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'docbook/wsug_src')

diff --git a/docbook/wsug_src/WSUG_app_files.xml b/docbook/wsug_src/WSUG_app_files.xml
index e346cd93d8..7f7f9f3453 100644
--- a/docbook/wsug_src/WSUG_app_files.xml
+++ b/docbook/wsug_src/WSUG_app_files.xml
@@ -709,15 +709,16 @@ Source port=Transmission_Control_Protocol#TCP_ports
 	<para>
       <variablelist>
 	<varlistentry>
-	  <term><command>7/Vista</command></term>
+	  <term><application>Windows 7</application>, <application>Windows Vista</application></term>
 	  <listitem>
 	<para>
 	<filename>C:\Users\&lt;username&gt;\AppData\Roaming\Wireshark</filename>
 	</para>
 	  </listitem>
 	</varlistentry>
+
 	<varlistentry>
-	  <term><command>XP/2000</command></term>
+	  <term><application>Windows XP</application></term>
 	  <listitem>
 	<para>
 	<filename>C:\Documents and Settings\&lt;username&gt;\Application Data</filename>, 
@@ -725,8 +726,19 @@ Source port=Transmission_Control_Protocol#TCP_ports
 	</para>
 	  </listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term><application>Windows 2000</application> (no longer supported by Wireshark, for historical reference only)</term>
+	  <listitem>
+	<para>
+	<filename>C:\Documents and Settings\&lt;username&gt;\Application Data</filename>, 
+	"Documents and Settings" and "Application Data" might be internationalized.
+	</para>
+	  </listitem>
+	</varlistentry>
+
 	<varlistentry>
-	  <term><command>NT 4 (no longer supported by Wireshark)</command></term>
+	  <term><application>Windows NT 4</application> (no longer supported, for historical reference only)</term>
 	  <listitem>
 	<para>
 	<filename>C:\WINNT\Profiles\&lt;username&gt;\Application Data\Wireshark</filename>
@@ -734,22 +746,21 @@ Source port=Transmission_Control_Protocol#TCP_ports
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><command>ME/98 - with enabled user profiles  (no longer supported by Wireshark)</command></term>
+	  <term><application>Windows ME</application>, <application>Windows 98</application> with user profiles (no longer supported, for historical reference only)</term>
 	  <listitem>
 	<para>
 	In Windows ME and 98 you can enable separate user profiles. In that case,
-	something like:
+	something like
 	<filename>C:\windows\Profiles\&lt;username&gt;\Application Data\Wireshark</filename>
 	is used.
 	</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><command>ME/98/95 (no longer supported by Wireshark)</command></term>
+	  <term><application>Windows ME</application>, <application>Windows 98</application> without user profiles (no longer supported, for historical reference only)</term>
 	  <listitem>
 	<para>
-	The default in Windows ME/98/95 is: all users work with the same profile,
-	which is located at: 
+	Without user profiles enabled the default location for all users is 
 	<filename>C:\windows\Application Data\Wireshark</filename>
 	</para>
 	  </listitem>
@@ -759,7 +770,7 @@ Source port=Transmission_Control_Protocol#TCP_ports
 	</section>
 
 	<section id="ChWindowsRoamingProfiles">
-	<title>Windows 7/Vista/XP/2000/NT roaming profiles</title>
+	<title>Windows 7, Vista, XP, 2000, and NT roaming profiles</title>
 	<para>
 	The following will only be applicable if you are using roaming profiles.
 	This might be the case, if you work in a Windows domain environment 
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index 2805423ecb..c13ed6457b 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -262,12 +262,14 @@
 	  releases of Windows lack memory protection (specifically <ulink
 	  url="http://msdn.microsoft.com/en-us/library/aa366898.aspx">VirutalProtect</ulink>)
 	  which we use to improve program safety and security. The last known
-	  version to work was Ethereal 0.99.0 (which includes WinPcap 3.1). You
+	  version to work was Ethereal 0.10.14 (which includes WinPcap 3.1). You
 	  can get it from <ulink url="http://ethereal.com/download.html" />.
 	  According to <ulink
 	  url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1130">this
 	  bug report</ulink>, you may need to install Ethereal 0.10.0 on some
 	  systems.
+	</para>
+	<para>
           Microsoft retired support for Windows 98 and ME in 2006.
 	</para></listitem>
 	<listitem><para>
@@ -276,6 +278,8 @@
 	  can get it from <ulink
 	  url="http://www.wireshark.org/download/win32/all-versions/wireshark-setup-0.99.4.exe"
 	  />.
+	</para>
+	<para>
 	  Microsoft retired support for Windows NT 4.0 in 2004.
 	</para></listitem>
 	<listitem><para>
@@ -283,6 +287,8 @@
 	  to work was Wireshark 1.2.x (which includes WinPcap 4.1.2). You still
 	  can get it from <ulink
 	  url="http://www.wireshark.org/download/win32/all-versions/" />.
+	</para>
+	<para>
 	  Microsoft retired support for Windows 2000 in 2010.
 	</para></listitem>
 	<listitem><para>
-- 
cgit v1.2.3