aboutsummaryrefslogtreecommitdiffstats
path: root/docs/mcc-help/en/drakrpm-edit-media.xml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/mcc-help/en/drakrpm-edit-media.xml')
-rw-r--r--docs/mcc-help/en/drakrpm-edit-media.xml27
1 files changed, 19 insertions, 8 deletions
diff --git a/docs/mcc-help/en/drakrpm-edit-media.xml b/docs/mcc-help/en/drakrpm-edit-media.xml
index ee667a7e..f219ab93 100644
--- a/docs/mcc-help/en/drakrpm-edit-media.xml
+++ b/docs/mcc-help/en/drakrpm-edit-media.xml
@@ -6,6 +6,7 @@
</info>
<!-- 2013-01-06 marja - added Qilaq's and spturtle's corrections -->
+
<!--2013-10-22 marja - improved wording, thanks to Aragorn :-)
- adjusted "Add" part to changed behaviour of this tool
(no longer a choice to only add "update sources" is
@@ -18,11 +19,17 @@
</mediaobject>
<para><important>
- <para>First thing to do after an install is to add software sources (also
- known as repositories, media, mirrors). That means you must select the
- media sources to be used to install and update packages and
+ <para>First thing to do after an install is to add software sources
+ (also known as repositories, media, mirrors). That means you must select
+ the media sources to be used to install and update packages and
applications. (see Add button below).</para>
- </important><note>
+ </important> <note>
+ <para>If you install (or upgrade) Mageia using an optical media (DVD or
+ CD) or a USB device, there will be a software source configured to the
+ optical media used. To avoid being asked to insert the media when you
+ install new packages, you should disable (or delete) this media.  (It
+ will have the media type CD-Rom).</para>
+ </note> <note>
<para>Your system is running under an architecture which may be 32-bit
(called i586), or 64-bit (called x86_64). Some packages are independent
of whether your system is 32-bit or 64-bit; these are called noarch
@@ -122,7 +129,7 @@
repositories contain only safe and well tested software. Clicking on the
"Add" button adds the mirrorlist to your configuration, it is designed to
make sure that you install and update from a mirror close to you. If you
- prefer to choose a specific mirror, then add it by choosing "Add a
+ prefer to choose a specific mirror, then add it by choosing "Add a
specific media mirror" from the drop-down "File" menu.</para>
<para><guibutton>Up and down arrows:</guibutton></para>
@@ -155,7 +162,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="drakrpmEditMedia2.png"/>
+ <imagedata fileref="drakrpmEditMedia2.png"/>
</imageobject>
</mediaobject>
@@ -200,6 +207,10 @@
configure it here. You only need to give the <guibutton>Proxy
hostname</guibutton> and if necessary a <guilabel>Username</guilabel> and
<guilabel>Password</guilabel>.</para>
- </section>
-</section>
+ <para/>
+
+ <para>For more information about configuring the media, see the Mageia
+ Wiki page: <link linkend="???"><link ns2:href="https://wiki.mageia.org/en/Software_management">https://wiki.mageia.org/en/Software_management</link></link></para>
+ </section>
+</section> \ No newline at end of file