aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/installer/en/installer.xml186
-rw-r--r--docs/mcc-help/en/drakboot--boot.xml1
-rw-r--r--docs/mcc-help/en/drakwizard_dhcp.xml275
-rw-r--r--docs/mcc-help/en/drakwizard_ntp.xml138
-rw-r--r--docs/mcc-help/en/drakwizard_squid.xml357
-rw-r--r--docs/mcc-help/en/rpmdrake.xml16
6 files changed, 687 insertions, 286 deletions
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index eb7e9fca..344e0ef8 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -1,5 +1,4 @@
-<?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" version="5.0" xml:id="installer">
-
+<?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="installer" version="5.0">
<!-- Made by marja on 2012 03 30, using barjac's text -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -35,17 +34,152 @@
<title xml:id="installer-ti2">Installation Welcome Screen</title>
</info>
+ <para>Here is the by default welcome screen when using a Mageia
+ DVD:</para>
+
<mediaobject>
<imageobject>
- <imagedata revision="1" fileref="../dx-welcome.png" align="center"
- format="PNG" xml:id="BId-drakx-intro-im1">
- </imagedata>
+ <imagedata xml:id="BId-drakx-intro-im1" revision="1" align="center" format="PNG" fileref="../dx-welcome.png"/>
</imageobject>
</mediaobject>
</figure>
- <para>If there are problems during install, then it may be necessary to use
- special installation options, see <xref linkend="installationOptions"></xref>.</para>
+ <para>From this first screen, it is possible to set some personal
+ preferences:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The language (for the installation only, may be different that the
+ chosen language for the system) by pressing the key F2</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome-lang.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Use the arrow keys to select the language and press the key
+ Enter.</para>
+
+ <para>Here is for example, the French welcome screen when using a Live
+ DVD/CD. Note that the Live DVD/CD menu does not propose:
+ <guilabel>Rescue System, Memory test</guilabel> and <guilabel>Hardware
+ Detection Tool</guilabel>.</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome4fr.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+ </listitem>
+
+ <listitem>
+ <para>The screen definition by pressing the key F3</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome5def.png"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Add some kernel options by pressing the key F6.</para>
+
+ <para>If the installation fails, then it may be necessary to try again
+ using one of the extra options. The menu called by F6 displays a new
+ line called <guilabel>Boot options</guilabel> and propose four
+ entries:</para>
+
+ <para>- Default, it doesn't alter anything in the by default
+ options.</para>
+
+ <para>- Safe Settings, priority is given to the safer options to the
+ detriment of performances.</para>
+
+ <para>- No ACPI (Advanced Configuration and Power Interface), power
+ management isn't taken into account.</para>
+
+ <para>- No Local APIC (Local Advanced Programmable Interrupt
+ Controller), it is about CPU interruptions, select this option if you
+ are askrd for.</para>
+
+ <para>When you select one of these entries, it modifies the already by
+ default options displayed in the <guilabel>Boot option</guilabel>
+ line.</para>
+
+ <note>
+ <para>In some Mageia release, it may happen that the entries selected
+ with the key F6 does not appear in the Boot Option line, however, they
+ are really taken into account.</para>
+ </note>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome6opt.png"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Add more kernel options by pressing the key F1</para>
+
+ <para>Pressing F1 opens a new window with more available options. Select
+ one with the arrow keys and press enter to have more details or press
+ the key ESC to go back to the welcome screen.</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcomeHelp1.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+
+ <para>The detailed view about the option splash. Press ESC or select
+ <guilabel>Return to Boot Options</guilabel> to go back to the options
+ list. These options can by added by hand in the <guilabel>Boot
+ option</guilabel> line.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcomeHelp2.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+
+ <note>
+ <para>The help is translated in the chosen language with the F2
+ key.</para>
+ </note>
+ </listitem>
+ </itemizedlist>
+
+ <para>Here is the by default welcome screen when using a Wired Network-based
+ Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+
+ <para>It does not allow to change the language, the available options are
+ described in the screen. For more information about using a Wired
+ Network-based Installation CD, see the Mageia Wiki <link ns2:href="???">https://wiki.mageia.org/en/Boot.iso_install</link></para>
+
+ <warning>
+ <para>The keyboard layout is the American one.</para>
+ </warning>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata revision="1" xml:id="installer-im2" align="center" format="PNG" fileref="../dx-help.png"/>
+ </imageobject>
+ </mediaobject>
<section xml:id="installationSteps">
<info>
@@ -76,30 +210,6 @@
</section>
<section xml:id="installationOptions">
- <info>
- <title xml:id="installationOptions-ti1">Installation options</title>
- </info>
-
- <para>If the installation fails then it may be necessary to try again by
- using one of the extra options available by hitting the <guibutton>F1
- (Help)</guibutton> key see <xref linkend="dx-welcome"></xref></para>
-
- <para>This will open the following text based help.</para>
-
- <figure xml:id="dx-help">
- <info>
- <title xml:id="installationOptions-ti2">Installation Help
- Screen</title>
- </info>
-
- <mediaobject>
- <imageobject>
- <imagedata revision="1" fileref="../dx-help.png" align="center"
- format="PNG" xml:id="installer-im2"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
-
<section xml:id="installationProblems">
<info>
<title xml:id="installationProblems-ti1">Installation Problems and
@@ -120,12 +230,12 @@
</listitem>
<listitem>
- <para revision="2">If the hardware is very old, a graphical installation may
- not be possible. In this case it is worth trying a text mode
- installation. To use this hit ESC at the first welcome screen and
- confirm with ENTER. You will be presented with a black screen with
- the word "boot:". Type "text" and hit ENTER. Now continue with the
- installation in text mode.<emphasis></emphasis></para>
+ <para revision="2">If the hardware is very old, a graphical
+ installation may not be possible. In this case it is worth trying
+ a text mode installation. To use this hit ESC at the first welcome
+ screen and confirm with ENTER. You will be presented with a black
+ screen with the word "boot:". Type "text" and hit ENTER. Now
+ continue with the installation in text mode.<emphasis/></para>
</listitem>
</itemizedlist>
</section>
@@ -144,7 +254,7 @@
<section xml:id="kernelOptions">
<info>
- <title xml:id="kernelOptions-ti1">Kernel Options</title>
+ <title xml:id="kernelOptions-ti1">RAM problem</title>
</info>
<para>These will rarely be needed, but in some cases the hardware may
diff --git a/docs/mcc-help/en/drakboot--boot.xml b/docs/mcc-help/en/drakboot--boot.xml
index 0f358fea..0d61c77e 100644
--- a/docs/mcc-help/en/drakboot--boot.xml
+++ b/docs/mcc-help/en/drakboot--boot.xml
@@ -117,5 +117,4 @@
<guilabel>initrd</guilabel> file and a <xref linkend="draknetprofile"></xref> in the drop-down
lists.</para>
- <para>You can start this tool from the command line, by typing <emphasis role="bold">drakboot --boot</emphasis> as root.</para>
</section> \ No newline at end of file
diff --git a/docs/mcc-help/en/drakwizard_dhcp.xml b/docs/mcc-help/en/drakwizard_dhcp.xml
index acda9b41..eab06e30 100644
--- a/docs/mcc-help/en/drakwizard_dhcp.xml
+++ b/docs/mcc-help/en/drakwizard_dhcp.xml
@@ -1,94 +1,205 @@
-<?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="drakwizard_dhcp" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_dhcp"
+ 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">
<info>
- <title xml:id="drakwizard_dhcp-ti1">Configure DHCP</title><subtitle>drakwizard dhcp</subtitle>
+ <title xml:id="drakwizard_dhcp-ti1">Configure DHCP</title>
+
+ <subtitle>drakwizard dhcp</subtitle>
</info>
<mediaobject>
<imageobject>
- <imagedata xml:id="drakwizard_dhcp-im1" revision="1" align="center" format="PNG" fileref="drakwizard_dhcp.png"/>
+ <imagedata align="center" fileref="drakwizard_dhcp.png" format="PNG"
+ revision="1" xml:id="drakwizard_dhcp-im1"/>
</imageobject>
</mediaobject>
- <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard dhcp</emphasis> as root.</para></footnote> can help you to set up a <acronym>DHCP</acronym> server.
- </para>
+ <para>This tool<footnote>
+ <para>You can start this tool from the command line, by typing <emphasis
+ role="bold">drakwizard dhcp</emphasis> as root.</para>
+ </footnote> can help you to set up a <acronym>DHCP</acronym> server. It is
+ a component of drakwizard which should be installed before you can access to
+ it.</para>
+
<section>
<title>What is DHCP?</title>
- <para>
- The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a standardized networking protocol used on IP networks that dynamically configures IP addresses and other information that is needed for Internet communication. (From Wikipedia)
- </para>
+
+ <para>The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is
+ a standardized networking protocol used on IP networks that dynamically
+ configures IP addresses and other information that is needed for Internet
+ communication. (From Wikipedia)</para>
+ </section>
+
+ <section>
+ <title>Setting up a DHCP server with drakwizard dhcp</title>
+
+ <para>Welcome to the DHCP server wizard.</para>
+
+ <procedure>
+ <step>
+ <title>Introduction</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step1.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im2"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>The first page is just an introduction, click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Selecting Adaptor</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step2.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im3"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Choose the network interface, which is connected to the subnet,
+ and for which DHCP will assign IP addresses, and then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Select IP range</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step3.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im4"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Select the beginning and ending IP addresses of the range of IPs
+ you want the server to offer, along with the IP of the gateway machine
+ connecting to some place outside the local network, hopefully close to
+ the Internet, then click <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Summary</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step4.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im5"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Take a second to check these options, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Hold on...</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step5.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im6"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>This can be fixed. Click <guibutton>Previous</guibutton> a few
+ times and change things around.</para>
+ </step>
+
+ <step>
+ <title>Hours later...</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-dhcp-step6.png"
+ format="PNG" revision="1" xml:id="drakwizard_dhcp-im7"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
+ </section>
+
+ <section>
+ <title>What is done</title>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>Installing the package dhcp-server if needed;</para>
+ </listitem>
+
+ <listitem>
+ <para>Saving <code>/etc/dhcpd.conf</code> in
+ <code>/etc/dhcpd.conf.orig;</code></para>
+ </listitem>
+
+ <listitem>
+ <para>Creating a new <code>dhcpd.conf</code> starting from
+ <code>/usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default</code>
+ and adding the new parameters:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><code>hname</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>dns</code></para>
+ </listitem>
+
+ <listitem>
+ <para>net</para>
+ </listitem>
+
+ <listitem>
+ <para>ip</para>
+ </listitem>
+
+ <listitem>
+ <para><code>mask</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>rng1</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>rng2</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>dname</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>gateway</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>tftpserverip</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>dhcpd_interface</code></para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>Also modifying Webmin configuration file
+ <code>/etc/webmin/dhcpd/config</code></para>
+ </listitem>
+
+ <listitem>
+ <para>Restarting <code>dhcpd.</code></para>
+ </listitem>
+ </itemizedlist></para>
</section>
- <section>
- <title>Setting up DHCP server with drakwizard dhcp</title>
- <para>
- Welcome to the DHCP server wizard.
- </para>
- <procedure>
- <step>
- <title>Introduction</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im2" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step1.png"/>
- </imageobject>
- </mediaobject>
- <para>
- The first page is just an introduction, click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Selecting Adaptor</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im3" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step2.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Choose network interface connected to the subnet DHCP will assign IPs for, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Select IP range</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im4" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step3.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Select the beginning and ending IP addresses of the range of IPs you want the server to offer, along with the IP of the gateway machine connecting to someplace outside the local net, hopeful close to the Internet, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Summary</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im5" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step4.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Take a second to check these options, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Hold on...</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im6" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step5.png"/>
- </imageobject>
- </mediaobject>
- <para>
- This can be fixed. Click <guibutton>Previous</guibutton> a few times and change things around. Don't keep track.
- </para>
- </step>
- <step>
- <title>Hours later...</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_dhcp-im7" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step6.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Another lesson learned.
- </para>
- </step>
- </procedure>
- </section>
</section>
diff --git a/docs/mcc-help/en/drakwizard_ntp.xml b/docs/mcc-help/en/drakwizard_ntp.xml
index b149088f..3b43d317 100644
--- a/docs/mcc-help/en/drakwizard_ntp.xml
+++ b/docs/mcc-help/en/drakwizard_ntp.xml
@@ -1,4 +1,11 @@
-<?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="drakwizard_ntp" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_ntp"
+ 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">
<info>
<title xml:id="drakwizard_ntp-ti1">Configure time</title>
@@ -9,56 +16,109 @@
<mediaobject>
<imageobject>
- <imagedata revision="1" fileref="drakwizard_ntp.png" xml:id="drakwizard_ntp-im1" align="center" format="PNG"/>
+ <imagedata align="center" fileref="drakwizard_ntp.png" format="PNG"
+ revision="1" xml:id="drakwizard_ntp-im1"/>
</imageobject>
</mediaobject>
<para>This tool<footnote>
- <para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard ntp</emphasis> as root.</para>
+ <para>You can start this tool from the command line, by typing <emphasis
+ role="bold">drakwizard ntp</emphasis> as root.</para>
</footnote> purpose is to set the time of your server synchronised with an
external server. It isn't installed by default and you have to also install
the drakwizard and drakwizard-base packages.</para>
- <para>After a welcome screen (see above), the second one ask you to choose
- three time servers in the drop down lists and suggests to use pool.ntp.org
- twice because this server always points to available time servers.</para>
+ <section>
+ <title>Setup a NTP server with drakwizard ntp</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="drakwizard-ntp1.png"/>
- </imageobject>
- </mediaobject>
+ <procedure>
+ <step>
+ <para>After a welcome screen (see above), the second one ask you to
+ choose three time servers in the drop down lists and suggests to use
+ pool.ntp.org twice because this server always points to available time
+ servers.</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="drakwizard-ntp2.png">
- <info>
- <author>
- <personname/>
- </author>
-
- <pubdate/>
- </info>
- </imagedata>
- </imageobject>
- </mediaobject>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="drakwizard-ntp1.png"/>
+ </imageobject>
+ </mediaobject>
- <para/>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="drakwizard-ntp2.png">
+ <info>
+ <author>
+ <personname/>
+ </author>
- <para>The following screens allows to choose the region and the city and
- then, you arrive on a summary. If something is wrong, you can obviously
- change it using the <guibutton>Previous </guibutton>button. If everything is
- right, click on the <guibutton>Next</guibutton> button to proceed to the
- test. It may take a while and you finally get this screen below:</para>
+ <pubdate/>
+ </info>
+ </imagedata>
+ </imageobject>
+ </mediaobject>
+ </step>
- <mediaobject>
- <imageobject>
- <imagedata fileref="drakwizard-ntp3.png"/>
- </imageobject>
- </mediaobject>
+ <step>
+ <para>The following screens allows to choose the region and the city
+ and then, you arrive on a summary. If something is wrong, you can
+ obviously change it using the <guibutton>Previous</guibutton>button.
+ If everything is right, click on the <guibutton>Next</guibutton>
+ button to proceed to the test. It may take a while and you finally get
+ this screen below:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="drakwizard-ntp3.png"/>
+ </imageobject>
+ </mediaobject>
+ </step>
+
+ <step>
+ <para>Click on the <guibutton>Finish</guibutton> button to close the
+ tool</para>
+ </step>
+ </procedure>
+
+ <para/>
+ </section>
+
+ <section>
+ <title>What is done</title>
+
+ <para>This tool executes the following steps:</para>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>Installing the package <code>ntp</code> if needed</para>
+ </listitem>
+
+ <listitem>
+ <para>Saving the files <code>/etc/sysconfig/clock</code> to
+ <code>/etc/sysconfig/clock.orig</code> and
+ <code>/etc/ntp/step-tickers</code> to
+ <code>/etc/ntp/step-tickers.orig</code>;</para>
+ </listitem>
+
+ <listitem>
+ <para>Writing a new file <code>/etc/ntp/step-tickers</code> with the
+ serveurs list;</para>
+ </listitem>
+
+ <listitem>
+ <para>Modifying the file <code>/etc/ntp.conf</code> by inserting the
+ first server name;</para>
+ </listitem>
- <para/>
+ <listitem>
+ <para>Stopping and starting <code>crond</code>, <code>atd</code> and
+ <code>ntpd</code> services;</para>
+ </listitem>
- <para>Click on the <guibutton>Finish</guibutton> button to close the
- tool</para>
-</section> \ No newline at end of file
+ <listitem>
+ <para>Setting the hardware clock to the current system time with UTC
+ reference.</para>
+ </listitem>
+ </itemizedlist></para>
+ </section>
+</section>
diff --git a/docs/mcc-help/en/drakwizard_squid.xml b/docs/mcc-help/en/drakwizard_squid.xml
index 1ee759d6..31ddb524 100644
--- a/docs/mcc-help/en/drakwizard_squid.xml
+++ b/docs/mcc-help/en/drakwizard_squid.xml
@@ -1,138 +1,243 @@
-<?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="drakwizard_squid" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_squid"
+ 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">
<info>
- <title xml:id="drakwizard_squid-ti1">Configure proxy</title><subtitle>drakwizard squid</subtitle>
+ <title xml:id="drakwizard_squid-ti1">Configure proxy</title>
+
+ <subtitle>drakwizard squid</subtitle>
</info>
<mediaobject>
<imageobject>
- <imagedata xml:id="drakwizard_squid-im1" revision="1" align="center" format="PNG" fileref="drakwizard_squid.png"/>
+ <imagedata align="center" fileref="drakwizard_squid.png" format="PNG"
+ revision="1" xml:id="drakwizard_squid-im1"/>
</imageobject>
</mediaobject>
- <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard squid</emphasis> as root.</para></footnote> can help you to set up a proxy server.
- </para>
+ <para>This tool<footnote>
+ <para>You can start this tool from the command line, by typing <emphasis
+ role="bold">drakwizard squid</emphasis> as root.</para>
+ </footnote> can help you to set up a proxy server. It is a component of
+ drakwizard which should be installed before you can access to it.</para>
+
<section>
<title>What is a proxy server?</title>
- <para>
- A proxy server is a server (a computer system or an application) that acts as an intermediary for requests from clients seeking resources from other servers. A client connects to the proxy server, requesting some service, such as a file, connection, web page, or other resource available from a different server and the proxy server evaluates the request as a way to simplify and control its complexity. (From Wikipedia)
- </para>
+
+ <para>A proxy server is a server (a computer system or an application)
+ that acts as an intermediary for requests from clients seeking resources
+ from other servers. A client connects to the proxy server, requesting some
+ service, such as a file, connection, web page, or other resource available
+ from a different server and the proxy server evaluates the request as a
+ way to simplify and control its complexity. (From Wikipedia)</para>
+ </section>
+
+ <section>
+ <title>Setting up a proxy server with drakwizard squid</title>
+
+ <para>Welcome to the proxy server wizard.</para>
+
+ <procedure>
+ <step>
+ <title>Introduction</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step1.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im2"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>The first page is just an introduction, click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Selecting the proxy port</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step2.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im3"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Select the proxy port browsers will connect through, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Set Memory and Disk Usage</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step3.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im4"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Set memory and disk cache limits, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Select Network Access Control</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step4.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im5"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Set visibility to local network or world, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Grant Network Access</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step5.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im6"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Grant access to local networks, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Use Upper Level Proxy Server?</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step6.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im7"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Cascade through another proxy server? If no, skip next
+ step.</para>
+ </step>
+
+ <step>
+ <title>Upper Level Proxy URL and Port</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step7.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im8"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Provide upper level proxy hostname and port, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Summary</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step8.png"
+ format="PNG" revision="1" xml:id="drakwizard_squid-im9"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Take a second to check these options, then click
+ <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Start during boot?</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step9.png"
+ format="PNG" revision="1"
+ xml:id="drakwizard_squid-im10"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Choose if the proxy server should be started during the boot
+ time, then click <guibutton>Next</guibutton>.</para>
+ </step>
+
+ <step>
+ <title>Finish</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="drakwizard-proxy-step10.png"
+ format="PNG" revision="1"
+ xml:id="drakwizard_squid-im11"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>You're done! Click <guibutton>Finish</guibutton>.</para>
+ </step>
+ </procedure>
+ </section>
+
+ <section>
+ <title>What is done</title>
+
+ <para><itemizedlist>
+ <listitem>
+ <para>Installing the package squid if needed;</para>
+ </listitem>
+
+ <listitem>
+ <para>Saving <code>/etc/squid/squid.conf</code> in
+ <code>/etc/squid/squid.conf.orig;</code></para>
+ </listitem>
+
+ <listitem>
+ <para>Creating a new <code>squid.conf</code> starting from
+ <code>squid.conf.default</code> and adding the new
+ parameters:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><code>cache_dir</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>localnet</code></para>
+ </listitem>
+
+ <listitem>
+ <para>cache_mem</para>
+ </listitem>
+
+ <listitem>
+ <para>http_port</para>
+ </listitem>
+
+ <listitem>
+ <para><code>level</code> 1, 2 or 3 and <code>http_access</code>
+ according to level</para>
+ </listitem>
+
+ <listitem>
+ <para><code>cache_peer</code></para>
+ </listitem>
+
+ <listitem>
+ <para><code>visible_hostname</code></para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>Restarting <code>squid.</code></para>
+ </listitem>
+ </itemizedlist></para>
</section>
- <section>
- <title>Setting up a proxy server with drakwizard squid</title>
- <para>
- Welcome to the proxy server wizard.
- </para>
- <procedure>
- <step>
- <title>Introduction</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im2" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step1.png"/>
- </imageobject>
- </mediaobject>
- <para>
- The first page is just an introduction, click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Selecting the proxy port</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im3" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step2.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Select the proxy port browsers will connect through, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Set Memory and Disk Usage</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im4" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step3.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Set memory and disk cache limits, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Select Network Access Control</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im5" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step4.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Set visibility to local network or world, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Grant Network Access</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im6" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step5.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Grant access to local networks, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Use Upper Level Proxy Server?</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im7" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step6.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Cascade through another proxy server? If no, skip next step.
- </para>
- </step>
- <step>
- <title>Upper Level Proxy URL and Port</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im8" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step7.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Provide upper level proxy hostname and port, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Summary</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im9" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step8.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Take a second to check these options, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Start during boot?</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im10" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step9.png"/>
- </imageobject>
- </mediaobject>
- <para>
- Choose if the proxy server should be started during the boot time, then click <guibutton>Next</guibutton>.
- </para>
- </step>
- <step>
- <title>Finish</title>
- <mediaobject>
- <imageobject>
- <imagedata xml:id="drakwizard_squid-im11" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step10.png"/>
- </imageobject>
- </mediaobject>
- <para>
- You're done! Click <guibutton>Finish</guibutton>.
- </para>
- </step>
- </procedure>
- </section>
</section>
diff --git a/docs/mcc-help/en/rpmdrake.xml b/docs/mcc-help/en/rpmdrake.xml
index 2e26e95f..eb047afb 100644
--- a/docs/mcc-help/en/rpmdrake.xml
+++ b/docs/mcc-help/en/rpmdrake.xml
@@ -33,6 +33,22 @@
included in the packages.</para>
<para>To work, rpmdrake needs the repositories to be configured with <xref linkend="drakrpm-edit-media"/> .</para>
+
+ <important>
+ <para>During the installation, the configured repository is the medium
+ used for the installation, generally the DVD or CD. If you keep this
+ medium, rpmdrake will ask it each time you want to install a package,
+ with this pop-up window : <mediaobject>
+ <imageobject>
+ <imagedata fileref="rpmdrake8.png"/>
+ </imageobject>
+ </mediaobject>If the above message annoys you and you have a good
+ internet connection without too strict download limit, it is wise to
+ remove that medium and replace it by online repositories thanks to <xref linkend="drakrpm-edit-media"/> .</para>
+
+ <para>Moreover, the online repositories are always up to date, contains
+ much more packages, and allow to update your installed packages.</para>
+ </important>
</section>
<section>