Remove mentions of DOS + unification of Windows versions

6 files changed, 10 insertions, 12 deletions

diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index 63b44735c..0ec85aaa8 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -45,10 +45,10 @@ The most important device files are listed in the tables below.
 <informaltable><tgroup cols="2"><tbody>
 <row>
   <entry><filename>ttyS0</filename></entry>
-  <entry>Serial port 0, COM1 under MS-DOS</entry>
+  <entry>Serial port 0, also referred to as COM1</entry>
 </row><row>
   <entry><filename>ttyS1</filename></entry>
-  <entry>Serial port 1, COM2 under MS-DOS</entry>
+  <entry>Serial port 1, also referred to as COM2</entry>
 </row><row>
   <entry><filename>psaux</filename></entry>
   <entry>PS/2 mouse device</entry>
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 6e79c5d10..2e8cb763e 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -243,7 +243,7 @@ to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 
 </para><para arch="any-x86">
 
-If you have an existing DOS or Windows partition that you want to preserve,
+If you have an existing Windows partition that you want to preserve,
 be very careful with automatic partitioning. If you choose manual partitioning,
 you can use the installer to resize existing FAT or NTFS partitions to create
 room for the &debian; install: simply select the partition and specify its new size.
diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml
index dfcd44487..fd8d9aa3e 100644
--- a/en/partitioning/partition/x86.xml
+++ b/en/partitioning/partition/x86.xml
@@ -24,7 +24,7 @@ bootloader.
 
 </para></note><para>
 
-If you have an existing other operating system such as DOS or Windows and
+If you have an existing other operating system such as Windows and
 you want to preserve that operating system while installing &debian;, you may
 need to resize its partition to free up space for the &debian; installation.
 The installer supports resizing of both FAT and NTFS filesystems; when you
diff --git a/en/preparing/needed-info.xml b/en/preparing/needed-info.xml
index 2db3a4d23..12eb563a5 100644
--- a/en/preparing/needed-info.xml
+++ b/en/preparing/needed-info.xml
@@ -339,7 +339,7 @@ On Windows systems, the IDs for a device can be found in the Windows device
 manager on the tab <quote>details</quote>, where the vendor ID is prefixed with VEN_
 and the product ID is prefixed with DEV_.
 
-On Windows 7 systems, you have to select the property <quote>Hardware IDs</quote> in the
+On Windows 7/10 systems, you have to select the property <quote>Hardware IDs</quote> in the
 device manager's details tab to actually see the IDs, as they are not
 displayed by default.
 
diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index 9f53f611a..f31ff773b 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -21,7 +21,7 @@ means an LPAR or VM guest in this case.
 If you already have an operating system on your system
 
 <phrase arch="any-x86">
-(Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
+(Windows, OS/2, MacOS, Solaris, FreeBSD, &hellip;)
 </phrase>
 
 <phrase arch="s390">
@@ -39,8 +39,7 @@ root filesystem.
 
 You can find information about your current partition setup by using
 a partitioning tool for your current operating system<phrase
-arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in
-DOS</phrase><phrase
+arch="any-x86">, such as the integrated Disk Manager in Windows</phrase><phrase
 arch="powerpc">, such as Disk Utility, Drive Setup, HD Toolkit, or MacTools</phrase><phrase
 arch="s390">, such as the VM diskmap</phrase>. Partitioning tools always
 provide a way to show existing partitions without making changes.
@@ -61,10 +60,9 @@ making space for additional partitions without losing existing data.  Even
 though this works quite well in most cases, making changes to the
 partitioning of a disk is an inherently dangerous action and should only be
 done after having made a full backup of all data.
-<phrase arch="any-x86">For FAT/FAT32 and NTFS partitions as used by DOS and
+<phrase arch="any-x86">For FAT/FAT32 and NTFS partitions as used by
 Windows systems, the ability to move and resize them losslessly is provided 
-both by &d-i; as well as by the integrated Disk Manager of Windows
-7. </phrase>
+both by &d-i; as well as by the integrated Disk Manager of Windows.</phrase>
 
 </para>
 
diff --git a/en/using-d-i/modules/clock-setup-finish.xml b/en/using-d-i/modules/clock-setup-finish.xml
index 45301f0cc..a6e8fbc6e 100644
--- a/en/using-d-i/modules/clock-setup-finish.xml
+++ b/en/using-d-i/modules/clock-setup-finish.xml
@@ -18,7 +18,7 @@ whether or not the clock is set to UTC.
 <phrase arch="powerpc">Macintosh hardware clocks are normally
 set to local time. If you want to dual-boot, select local time instead of
 UTC.</phrase>
-<phrase arch="any-x86">Systems that (also) run Dos or Windows are normally
+<phrase arch="any-x86">Systems that (also) run Windows are normally
 set to local time. If you want to dual-boot, select local time
 instead of UTC.</phrase>