aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/en
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@mageia.org>2013-04-26 20:10:58 +0000
committerYuri Chornoivan <yurchor@mageia.org>2013-04-26 20:10:58 +0000
commit767fc7e69df9e489d0b0a39640a6f73b5144e369 (patch)
tree3fecb2b117429217f22aab4b0eaa28367fc1fecc /docs/installer/en
parent6a7b1023d2bfe2f02f4bb9e1516931b8d3f84f45 (diff)
downloadtools-767fc7e69df9e489d0b0a39640a6f73b5144e369.tar
tools-767fc7e69df9e489d0b0a39640a6f73b5144e369.tar.gz
tools-767fc7e69df9e489d0b0a39640a6f73b5144e369.tar.bz2
tools-767fc7e69df9e489d0b0a39640a6f73b5144e369.tar.xz
tools-767fc7e69df9e489d0b0a39640a6f73b5144e369.zip
Ukrainian translation update + other updates
Diffstat (limited to 'docs/installer/en')
-rw-r--r--docs/installer/en/misc-params.xml91
1 files changed, 39 insertions, 52 deletions
diff --git a/docs/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml
index 369e8cd8..73a82423 100644
--- a/docs/installer/en/misc-params.xml
+++ b/docs/installer/en/misc-params.xml
@@ -1,16 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="misc-params" version="5.0">
-
- <info>
- <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
- </info>
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="misc-params" version="5.0">
+ <info>
+ <title xml:id="misc-params-ti1">Summary of miscellaneous
+ parameters</title>
+ </info>
<!-- Started by marja on 2012 03 31 -->
@@ -34,16 +26,14 @@
<!-- 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. -->
<!-- 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" -->
- <!--2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files-->
-
+ <!--2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files-->
- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata revision="1" fileref="dx2-summary.png" width="800" align="center"
- format="PNG" depth="600" xml:id="summary-im1"></imagedata>
- </imageobject>
- </mediaobject>
+ <imagedata fileref="dx2-summary.png" width="800" revision="1" align="center" format="PNG" xml:id="summary-im1" depth="600"/>
+ </imageobject>
+ </mediaobject>
<para revision="1" xml:id="misc-params-pa1">DrakX made smart choices for the
configuration of your system depending on the choices you made and on the
@@ -57,24 +47,24 @@
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa2"><guilabel>Timezone</guilabel></para>
+ <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
- <para revision="1" xml:id="misc-params-system-pa2a">DrakX selected a
+ <para xml:id="misc-params-system-pa2a" revision="1">DrakX selected a
time zone for you, depending on your preferred language. You can
- change it if needed. See also <xref linkend="configureTimezoneUTC"></xref></para>
+ change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country /
+ <para xml:id="misc-params-system-pa3" revision="1"><guilabel>Country /
Region</guilabel></para>
<para revision="1" xml:id="misc-params-system-pa3a">If you are not in
the selected country, it is very important that you correct the
- setting. See <xref linkend="selectCountry"></xref></para>
+ setting. See <xref linkend="selectCountry"/></para>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+ <para xml:id="misc-params-system-pa4" revision="1"><guilabel>Bootloader</guilabel></para>
<para revision="2" xml:id="misc-params-system-pa4a">DrakX has made
good choices for the bootloader setting.</para>
@@ -83,7 +73,7 @@
anything, unless you know how to configure Grub and/or Lilo</para>
<para revision="2" xml:id="misc-params-system-pa4c">For more
- information, see <xref linkend="setupBootloader"></xref></para>
+ information, see <xref linkend="setupBootloader"/></para>
</listitem>
<listitem>
@@ -99,20 +89,20 @@
<listitem>
<para revision="1" xml:id="misc-params-system-pa6"><guilabel>Services</guilabel>:</para>
- <para revision="1" xml:id="misc-params-system-pa6a">System services
+ <para xml:id="misc-params-system-pa6a" revision="1">System services
refer to those small programs which run the background (daemons). This
tool allows you to enable or disable certain tasks.</para>
- <para revision="1" xml:id="misc-params-system-pa6b">You should check
+ <para xml:id="misc-params-system-pa6b" revision="1">You should check
carefully before changing anything here - a mistake may prevent your
- computer from operating correctly.</para>
-<para>For more information, see <xref linkend="configureServices"></xref></para>
+ computer from operating correctly.</para>
+
+ <para>For more information, see <xref linkend="configureServices"/></para>
</listitem>
</itemizedlist>
</section>
<section xml:id="misc-params-hardware">
-
<info>
<title xml:id="misc-params-hardware-ti3">Hardware parameters</title>
</info>
@@ -121,7 +111,7 @@
<listitem>
<para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>Keyboard</guilabel>:</para>
- <para revision="1" xml:id="misc-params-hardware-pa1a">This is where
+ <para xml:id="misc-params-hardware-pa1a" revision="1">This is where
you setup or change your keyboard layout which will depend on your
location, language or type of keyboard.</para>
</listitem>
@@ -143,24 +133,22 @@
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-hardware-pa4"><guilabel>Graphical
+ <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical
interface</guilabel>:</para>
<para revision="1" xml:id="misc-params-hardware-pa4a">This section
allows you to configure your graphic card(s) and displays.</para>
<para revision="1" xml:id="misc-params-hardware-pa4b">For more
- information, see <xref linkend="configureX_chooser"></xref>.</para>
+ information, see <xref linkend="configureX_chooser"/>.</para>
</listitem>
</itemizedlist>
- <mediaobject>
- <imageobject>
- <imagedata revision="1" fileref="dx2-summaryBottom.png" align="center" width="800"
- format="PNG" depth="600" xml:id="summaryBottom-im1">
- </imagedata>
- </imageobject>
- </mediaobject>
+ <mediaobject>
+ <imageobject>
+ <imagedata xml:id="summaryBottom-im1" width="800" revision="1" align="center" format="PNG" fileref="dx2-summaryBottom.png" depth="600"/>
+ </imageobject>
+ </mediaobject>
</section>
<section xml:id="misc-params-network">
@@ -173,23 +161,23 @@
<listitem>
<para revision="1" xml:id="misc-params-network-pa1"><guilabel>Network</guilabel>:</para>
- <para revision="1" xml:id="misc-params-network-pa2">You can configure
+ <para xml:id="misc-params-network-pa2" revision="1">You can configure
your network here, but for network cards with non-free drivers it is
better to do that after reboot, in the <application>Mageia Control
- Center</application>, after having enabled the non-free media
+ Center</application>, if you have not yet enabled the non-free media
repositories.</para>
<warning>
- <para revision="1" xml:id="misc-params-network-pa3">When you add a
+ <para xml:id="misc-params-network-pa3" revision="1">When you add a
network card, do not forget to set your firewall to watch that
interface as well.</para>
</warning>
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-network-pa4"><guilabel>Proxies</guilabel>:</para>
+ <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
- <para revision="1" xml:id="misc-params-network-pa4a">A Proxy Server
+ <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server
acts as an intermediary between your computer and the wider internet.
This section allows you to configure your computer to utilize a proxy
service.</para>
@@ -208,7 +196,7 @@
<itemizedlist>
<listitem>
- <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security
+ <para xml:id="misc-params-security-pa1" revision="1"><guilabel>Security
Level</guilabel>:</para>
<para revision="1" xml:id="misc-params-security-pa1a">Here you set the
@@ -220,9 +208,9 @@
</listitem>
<listitem>
- <para revision="1" xml:id="misc-params-security-pa2"><guilabel>Firewall</guilabel>:</para>
+ <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
- <para revision="1" xml:id="misc-params-security-pa2a">A firewall is
+ <para xml:id="misc-params-security-pa2a" revision="1">A firewall is
intended to be a barrier between your important data and the rascals
out there on the internet who would compromise or steal it.</para>
@@ -237,5 +225,4 @@
</listitem>
</itemizedlist>
</section>
-
-</section>
+</section> \ No newline at end of file