Merge branch 'zeha/rm-dmraid' into 'master'

Remove dmraid (sata raid)

See merge request installer-team/installation-guide!26

5 files changed, 0 insertions, 35 deletions

diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index 72d68c8ca..07b7d8bc8 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -38,7 +38,6 @@
 <!ENTITY url-bts "https://bugs.debian.org/">
 <!ENTITY url-bts-debian-installer "&url-bts;cgi-bin/pkgreport.cgi?maint=debian-boot@lists.debian.org">
 
-<!ENTITY url-d-i-sataraid "&url-d-i-wiki;SataRaid">
 <!ENTITY url-d-i-multipath "&url-d-i-wiki;MultipathSupport">
 
 <!ENTITY url-ports "https://&www-debian-org;/ports/&arch-porturl;/">
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index ba954f52d..661eef522 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -561,7 +561,6 @@ always need to specify a value as well: for example,
 <row><entry>hostname&nbsp;&nbsp;&nbsp;</entry><entry>netcfg/get_hostname</entry></row>
 <row><entry>protocol</entry><entry>mirror/protocol</entry></row>
 <row><entry>suite</entry><entry>mirror/suite</entry></row>
-<row><entry>dmraid</entry><entry>disk-detect/dmraid/enable</entry></row>
 <row><entry>recommends</entry><entry>base-installer/install-recommends</entry></row>
 <row><entry>tasks</entry><entry>tasksel:tasksel/first</entry></row>
 <row><entry>desktop</entry><entry>tasksel:tasksel/desktop</entry></row>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 91d981406..5cb130714 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -288,18 +288,6 @@ this misbehavior.
 </varlistentry>
 
 <varlistentry>
-<term>disk-detect/dmraid/enable (dmraid)</term>
-<listitem><para>
-
-Set to <userinput>true</userinput> to enable support for Serial ATA RAID
-(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer.
-Note that this support is currently experimental. Additional information
-can be found on the <ulink url="&url-d-i-wiki;">&debian; Installer Wiki</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term>preseed/url (url)</term>
 <listitem><para>
 
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index bb56e017f..15d748f8c 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -53,14 +53,6 @@ storage devices, which in many cases can be used in combination.
   <listitem><para>
     <emphasis>Encryption</emphasis>
   </para></listitem>
-  <listitem arch="x86"><para>
-    <emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)
-  </para><para>
-    Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>.
-    Support for Serial ATA RAID is currently only available if enabled when
-    the installer is booted. Further information is available on
-    <ulink url="&url-d-i-sataraid;">our Wiki</ulink>.
-  </para></listitem>
   <listitem><para>
     <emphasis>Multipath</emphasis> (experimental)
   </para><para>
diff --git a/pt_BR/boot-installer/parameters.xml b/pt_BR/boot-installer/parameters.xml
index c4107f94e..3c2ea2473 100644
--- a/pt_BR/boot-installer/parameters.xml
+++ b/pt_BR/boot-installer/parameters.xml
@@ -305,19 +305,6 @@ notebooks apresentam este mal comportamento.
 </varlistentry>
 
 <varlistentry>
-<term>disk-detect/dmraid/enable (dmraid)</term>
-<listitem><para>
-
-Defina como <userinput>true</userinput> para habilitar o suporte a discos
-Serial ATA RAID (também chamado de ATA RAID, BIOS RAID ou falso RAID) no
-instalador. Note que esse suporte atualmente é experimental. Informações
-adicionais podem ser encontradas no
-<ulink url="&url-d-i-wiki;">Wiki do Debian Installer</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
 <term>preseed/url (url)</term>
 <listitem><para>