Fix a few Linux-isms

1 files changed, 22 insertions, 20 deletions

diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index 22f58403f..5e5cb1810 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -50,7 +50,7 @@ smaller hard disks.
 Some options can only be changed when installing at medium or low debconf
 priority; at higher priorities sensible defaults will be used.
 
-</para><para>
+</para><para arch="linux-any">
 
 The installer supports various forms of advanced partitioning and use of
 storage devices, which in many cases can be used in combination.
@@ -84,7 +84,7 @@ storage devices, which in many cases can be used in combination.
   </para></listitem>
 </itemizedlist>
 
-</para><para arch="linux-any">
+</para><para>
 
 The following file systems are supported.
 
@@ -92,20 +92,20 @@ The following file systems are supported.
   <listitem><para>
     <phrase arch="arm;mipsel"><emphasis>ext2r0</emphasis>,</phrase>
     <emphasis>ext2</emphasis>,
-    <emphasis>ext3</emphasis>,
-    <emphasis>ext4</emphasis>
-  </para><para>
+    <phrase arch="linux-any"><emphasis>ext3</emphasis>,</phrase>
+    <phrase arch="linux-any"><emphasis>ext4</emphasis></phrase>
+  </para><para arch="linux-any">
     The default file system selected in most cases is ext3; for
     <filename>/boot</filename> partitions ext2 will be selected by default
     when guided partitioning is used.
   </para></listitem>
-  <listitem><para>
+  <listitem arch="linux-any"><para>
     <emphasis>jfs</emphasis> (not available on all architectures)
   </para></listitem>
-  <listitem><para>
+  <listitem arch="linux-any"><para>
     <emphasis>xfs</emphasis> (not available on all architectures)
   </para></listitem>
-  <listitem><para>
+  <listitem arch="linux-any"><para>
     <emphasis>reiserfs</emphasis> (optional; not available on all architectures)
   </para><para>
     Support for the Reiser file system is no longer available by default.
@@ -141,7 +141,7 @@ The following file systems are supported.
 
    <sect3 id="partman-auto">
    <title>Guided Partitioning</title>
-<para>
+<para arch="linux-any">
 
 If you choose guided partitioning, you may have three options: to create
 partitions directly on the hard disk (classic method), or to create them
@@ -156,12 +156,12 @@ makes use of the kernel's <quote>dm-crypt</quote> support.
 </footnote>.
 
 </para>
-<note><para>
+<note><para arch="linux-any">
 
 The option to use (encrypted) LVM may not be available on all architectures.
 
 </para></note>
-<para>
+<para arch="linux-any">
 
 When using LVM or encrypted LVM, the installer will create most
 partitions inside one big partition; the advantage of this method is that
@@ -170,7 +170,7 @@ In the case of encrypted LVM the big partition will not be readable without
 knowing a special key phrase, thus providing extra security of your
 (personal) data.
 
-</para><para>
+</para><para arch="linux-any">
 
 When using encrypted LVM, the installer will also automatically erase the
 disk by writing random data to it. This further improves security (as it
@@ -179,7 +179,7 @@ makes sure that any traces of previous installations are erased), but may
 take some time depending on the size of your disk.
 
 </para>
-<note><para>
+<note><para arch="linux-any">
 
 If you choose guided partitioning using LVM or encrypted LVM, some changes
 in the partition table will need to be written to the selected disk while
@@ -191,8 +191,8 @@ they are written to disk.
 </para></note>
 <para>
 
-If you choose guided partitioning (either classic or using (encrypted)
-LVM) for a whole disk, you will first be asked to select the disk you want
+If you choose guided partitioning<phrase arch="linux-any"> (either classic or using (encrypted)
+LVM)</phrase> for a whole disk, you will first be asked to select the disk you want
 to use. Check that all your disks are listed and, if you have several disks,
 make sure you select the correct one. The order they are listed in may
 differ from what you are used to. The size of the disks may help to identify
@@ -202,9 +202,11 @@ them.
 
 Any data on the disk you select will eventually be lost, but you will always
 be asked to confirm any changes before they are written to the disk.
+<phrase arch="linux-any">
 If you have selected the classic method of partitioning, you will be able to
 undo any changes right until the end; when using (encrypted) LVM this is not
 possible.
+</phrase>
 
 </para><para>
 
@@ -251,7 +253,7 @@ partitioning will fail.
 
 </tbody></tgroup></informaltable>
 
-<para>
+<para arch="linux-any">
 
 If you choose guided partitioning using (encrypted) LVM, the installer will also create
 a separate <filename>/boot</filename> partition. The other partitions,
@@ -339,14 +341,14 @@ its size, type (primary or logical), and location (beginning or end of
 the free space). After this, you will be presented with a detailed
 overview of your new partition. The main setting is <guimenuitem>Use
 as:</guimenuitem>, which determines if the partition will have a file
-system on it, or be used for swap, software RAID, LVM, an encrypted
-file system, or not be used at all. Other settings include
+system on it, or be used for swap,<phrase arch="linux-any"> software RAID, LVM, an encrypted
+file system,</phrase> or not be used at all. Other settings include
 mountpoint, mount options, and bootable flag; which settings are shown
 depends on how the partition is to be used. If you don't like the
 preselected defaults, feel free to change them to your liking. E.g. by
 selecting the option <guimenuitem>Use as:</guimenuitem>, you can
 choose a different filesystem for this partition, including options
-to use the partition for swap, software RAID, LVM, or not
+to use the partition for swap,<phrase arch="linux-any"> software RAID, LVM,</phrase> or not
 use it at all. Another nice feature is the ability to copy data from
 an existing partition onto this one.
 When you are satisfied with your new partition, select
@@ -378,7 +380,7 @@ If you forget to select and format an EFI boot partition,
 <command>partman</command> will detect this and will not let you continue
 until you allocate one.
 
-</para><para>
+</para><para arch="linux-any">
 
 Capabilities of <command>partman</command> can be extended with installer
 modules, but are dependent on your system's architecture. So if you can't