summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ca/install-methods/usb-setup/x86.xml8
-rw-r--r--ca/post-install/post-install.xml3
-rw-r--r--ca/preparing/bios-setup/s390.xml2
-rw-r--r--ca/preparing/bios-setup/sparc.xml6
-rw-r--r--ca/preparing/needed-info.xml4
-rw-r--r--ca/using-d-i/modules/ia64/elilo-installer.xml2
6 files changed, 11 insertions, 14 deletions
diff --git a/ca/install-methods/usb-setup/x86.xml b/ca/install-methods/usb-setup/x86.xml
index dc15ea287..08a9b11db 100644
--- a/ca/install-methods/usb-setup/x86.xml
+++ b/ca/install-methods/usb-setup/x86.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 -->
+<!-- original version: 43730 -->
<sect3 arch="x86">
<title>Particionar un llapis USB a &arch-title;</title>
@@ -90,12 +90,8 @@ les següents línies:
<informalexample><screen>
default vmlinuz
-append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw
+append initrd=initrd.gz
</screen></informalexample>
-Fixeu-vos que el paràmetre <userinput>ramdisk_size</userinput> hauria de
-incrementar-se depenent de la imatge que esteu arrencant.
-
</para>
</sect3>
-
diff --git a/ca/post-install/post-install.xml b/ca/post-install/post-install.xml
index 86d52e307..79e690e7e 100644
--- a/ca/post-install/post-install.xml
+++ b/ca/post-install/post-install.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43500 -->
+<!-- original version: 43623 -->
<chapter id="post-install">
<title>Següents passos i per on seguir</title>
@@ -8,6 +8,7 @@
&new-to-unix.xml;
&orientation.xml;
&further-reading.xml;
+&mail-setup.xml;
&kernel-baking.xml;
&rescue.xml;
diff --git a/ca/preparing/bios-setup/s390.xml b/ca/preparing/bios-setup/s390.xml
index 06dac387a..7429810fc 100644
--- a/ca/preparing/bios-setup/s390.xml
+++ b/ca/preparing/bios-setup/s390.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 -->
+<!-- original version: 43655 -->
<sect2 arch="s390"><title>Configuració de la BIOS</title>
diff --git a/ca/preparing/bios-setup/sparc.xml b/ca/preparing/bios-setup/sparc.xml
index 8736e3d02..45fbb5f53 100644
--- a/ca/preparing/bios-setup/sparc.xml
+++ b/ca/preparing/bios-setup/sparc.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 -->
+<!-- original version: 43641 -->
<sect2 arch="sparc" id="invoking-openboot"><title>Invocant OpenBoot</title>
@@ -55,14 +55,14 @@ Amb les noves versions, podeu usar dispositius OpenBoot com
obvi; el dispositiu <quote>net</quote> és per arrencar usant la xarxa.
Addicionalment, el nom del dispositiu por especificar una determinada
partició d'un disc, com <quote>disk2:a</quote> per arrencar disk2, primera
-partició. Tots els noms de dispositiu OpenBoot tenen la forma
+partició. Tots els noms de dispositiu OpenBoot tenen la forma:
<informalexample>
<screen>
<replaceable>nom-del-controlador</replaceable>@
<replaceable>adreça-d'unitat</replaceable>:
<replaceable>arguments-del-dispositiu</replaceable>
-</screen></informalexample>.
+</screen></informalexample>
A antigues revisions d'OpenBoot, la nomenclatura de dispositius és una
mica diferent: el dispositiu «floppy» s'anomena <quote>/fd</quote>, i
diff --git a/ca/preparing/needed-info.xml b/ca/preparing/needed-info.xml
index fcd4f47bd..f8e3f11d5 100644
--- a/ca/preparing/needed-info.xml
+++ b/ca/preparing/needed-info.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 43558 -->
<sect1 id="needed-info">
<title>Informació requerida</title>
@@ -395,7 +395,7 @@ del domini).
</para></listitem>
</itemizedlist>
-</para><para condition="supports-dhcp">
+</para><para>
D'altra banda, si l'administrador us indica que hi ha un servidor DHCP a
l'abast i el recomana, aleshores no us cal aquesta informació ja que el
diff --git a/ca/using-d-i/modules/ia64/elilo-installer.xml b/ca/using-d-i/modules/ia64/elilo-installer.xml
index 06a99d853..7f35c7523 100644
--- a/ca/using-d-i/modules/ia64/elilo-installer.xml
+++ b/ca/using-d-i/modules/ia64/elilo-installer.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 24321 -->
+<!-- original version: 43573 -->
<sect3 arch="ia64">
<title>Instal·lació del carregador <command>ELILO</command>