Mageia Bugzilla – Attachment 502 Details for
Bug 1517
A patch for http://mageia.org/en/1/migrate/
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Patch for the /migrate/ page
migrate.patch (text/plain), 7.11 KB, created by
Ahmad Samir
on 2011-06-02 06:47:58 CEST
(
hide
)
Description:
Patch for the /migrate/ page
Filename:
MIME Type:
Creator:
Ahmad Samir
Created:
2011-06-02 06:47:58 CEST
Size:
7.11 KB
patch
obsolete
>--- Migrate from Mandriva Linux to Mageia.html.orig 2011-06-02 06:17:50.000000000 +0200 >+++ Migrate from Mandriva Linux to Mageia.html 2011-06-02 06:43:02.793884229 +0200 >@@ -38,16 +38,16 @@ > <p id="subnav"><a href="http://mageia.org/en/1/">1</a> | <a href="http://mageia.org/en/1/for-you/">For you</a> | <a href="http://mageia.org/en/downloads/">Download</a> | <a href="http://mageia.org/en/1/next/">And next?</a> | <a href="http://mageia.org/en/1/notes/">Notes</a></p> > </div> <div class="para"> > <p>Upgrading from Mandriva Linux 2010.1 and 2010.2 is supported, and has been fine tuned over the past >- months, so it should work. But as always and before:</p> >+ months, so it should work. But as always, before commencing with the upgrade:</p> > <ul> >- <li>back up your data before upgrading;</li><li>if you are upgrading a laptop, connect to power! >- You might be updating over 2000 packages, and this can take some time;</li><li>do not start up any net-intensive applications during the upgrade >+ <li>Back up your data before upgrading;</li><li>if you are upgrading a laptop, don't leave it running on batteries, but connect it to AC power! >+ You might be updating over 2000 packages, and this can take some time;</li><li>Do not start any bandwidth-consuming applications during the upgrade > â you need to reserve bandwidth for the upgrade.</li> </ul> > <p>There are several ways to upgrade from one of those previous Mandriva releases:</p> > <ul> > <li><a href="#dvd">using the Mageia 1 DVD</a></li> > <li><a href="#inline">using the online media sources directly</a>, >- using <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.</li> >+ via <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.</li> > </ul> > <hr> > <h2 id="dvd">Upgrade using the Mageia 1 DVD</h2> >@@ -66,45 +66,45 @@ > <p>This can be done either using the graphical <code>mgaonline</code> tool > or the command-line <code>urpmi</code>. > Both methods are outlined below. But first, download and install >- this <code>mgaonline</code> package that will help you through the process:</p> >+ this <code>mgaonline</code> package that's necessary for this method to work:</p> > > <p style="text-align: center;"><a href="http://mageia.org/en/downloads/dl.php?product=mgaonline" rel="nofollow" title="Download mgaonline"><img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/application-x-rpm.png" alt="mgaonline"><br> > mgaonline<br> >- for Mandriva Linux 2010.1 or 2010.2</a></p> >+ for Mandriva Linux 2010.1 and 2010.2</a></p> > > <br> >- <p>Note that you may get a security warning, due to invalid package signatures. >- This is because a Mandriva system does not recognise Mageia signatures; >+ <p>Note that you may get a security warning, due to invalid RPM package key signature. >+ This is because a Mandriva system would naturally not recognise the Mageia RPM signatures; > you can safely ignore these warnings. >- Yes, that sucks, we know.</p> >- <p>So, it installed the package? Good, let's move on and pick a) or b) below:</p> >+ Yes, that sucks, we know!</p> >+ <p>So, the package has been installed? Good, let's move on, pick either a) or b) below:</p> > <br> > <h2 id="mgaonline">a) Upgrading inline, using mgaonline (GUI)</h2> > <p>a) Upgrading inline, using mgaonline (GUI)</p> > <img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/mgaonline8.png" alt="mgaonline pop-up" class="screen-copy"> > >- <p>Just follow the wizard instructions; it will configure Mageia media sources and start the migration.</p> >+ <p>Just follow the wizard instructions; it will configure the Mageia media sources and start the migration.</p> > <img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/mgaonline2.png" alt="mgaonline pop-up" class="screen-copy"> > >- <p>As soon as the migration is complete, you should restart your system; and here you are.</p> >+ <p>After the migration is complete, you should restart your system; and you should be presented by your upgraded system!</p> > > <br> > <h2 id="urpmi">b) Upgrading inline, using urpmi (CLI)</h2> > <p>You can also upgrade using <code>urpmi</code> from your favourite terminal emulator, >- if you are confortable with it. Here are the steps:</p> >+ if you are more comfortable using the CLI. Here are the steps:</p> > <ul> > <li><p>Remove all the existing media sources on your system:</p> > <p><code class="term">$ su<br> > # urpmi.removemedia -a</code></p></li> > <li><p>Add the Mageia online sources:</p> > <ul> >- <li><p>either directly (this will select a best matching mirror, after your location):</p> >+ <li><p>Either using the MIRRORLIST (this will select the best matching mirror, according to your geographical location); Note that for this method to work, <b>you must install the mgaonline package first (see above)</b>:</p> > <p><code class="term">$ su<br> > # urpmi.addmedia --distrib --mirrorlist</code></p> > </li> >- <li><p>either using a specific media mirror (you can decide from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):</p> >+ <li><p>Or using a specific media mirror (you can get the <i>mirror_url</i> from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):</p> > <p><code class="term">$ su<br> >- # urpmi.addmedia --distrib <media_url></code></p> >+ # urpmi.addmedia --distrib <mirror_url></code></p> > </li> > </ul> > </li> >@@ -117,7 +117,7 @@ > <div class="yui-u first"><div class="para" style="padding-right: 0;"> > <h3>Have a question?</h3> > <p>Do not hesitate to join our <a href="irc://irc.freenode.net/#mageia">#mageia</a> >- IRC channel on Freenode or go in <a href="http://forums.mageia.org/">our forum</a> >+ IRC channel on Freenode or posting in <a href="http://forums.mageia.org/">our forum</a> > to ask for assistance or details.</p> > > </div></div>
--- Migrate from Mandriva Linux to Mageia.html.orig 2011-06-02 06:17:50.000000000 +0200 +++ Migrate from Mandriva Linux to Mageia.html 2011-06-02 06:43:02.793884229 +0200 @@ -38,16 +38,16 @@ <p id="subnav"><a href="http://mageia.org/en/1/">1</a> | <a href="http://mageia.org/en/1/for-you/">For you</a> | <a href="http://mageia.org/en/downloads/">Download</a> | <a href="http://mageia.org/en/1/next/">And next?</a> | <a href="http://mageia.org/en/1/notes/">Notes</a></p> </div> <div class="para"> <p>Upgrading from Mandriva Linux 2010.1 and 2010.2 is supported, and has been fine tuned over the past - months, so it should work. But as always and before:</p> + months, so it should work. But as always, before commencing with the upgrade:</p> <ul> - <li>back up your data before upgrading;</li><li>if you are upgrading a laptop, connect to power! - You might be updating over 2000 packages, and this can take some time;</li><li>do not start up any net-intensive applications during the upgrade + <li>Back up your data before upgrading;</li><li>if you are upgrading a laptop, don't leave it running on batteries, but connect it to AC power! + You might be updating over 2000 packages, and this can take some time;</li><li>Do not start any bandwidth-consuming applications during the upgrade â you need to reserve bandwidth for the upgrade.</li> </ul> <p>There are several ways to upgrade from one of those previous Mandriva releases:</p> <ul> <li><a href="#dvd">using the Mageia 1 DVD</a></li> <li><a href="#inline">using the online media sources directly</a>, - using <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.</li> + via <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.</li> </ul> <hr> <h2 id="dvd">Upgrade using the Mageia 1 DVD</h2> @@ -66,45 +66,45 @@ <p>This can be done either using the graphical <code>mgaonline</code> tool or the command-line <code>urpmi</code>. Both methods are outlined below. But first, download and install - this <code>mgaonline</code> package that will help you through the process:</p> + this <code>mgaonline</code> package that's necessary for this method to work:</p> <p style="text-align: center;"><a href="http://mageia.org/en/downloads/dl.php?product=mgaonline" rel="nofollow" title="Download mgaonline"><img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/application-x-rpm.png" alt="mgaonline"><br> mgaonline<br> - for Mandriva Linux 2010.1 or 2010.2</a></p> + for Mandriva Linux 2010.1 and 2010.2</a></p> <br> - <p>Note that you may get a security warning, due to invalid package signatures. - This is because a Mandriva system does not recognise Mageia signatures; + <p>Note that you may get a security warning, due to invalid RPM package key signature. + This is because a Mandriva system would naturally not recognise the Mageia RPM signatures; you can safely ignore these warnings. - Yes, that sucks, we know.</p> - <p>So, it installed the package? Good, let's move on and pick a) or b) below:</p> + Yes, that sucks, we know!</p> + <p>So, the package has been installed? Good, let's move on, pick either a) or b) below:</p> <br> <h2 id="mgaonline">a) Upgrading inline, using mgaonline (GUI)</h2> <p>a) Upgrading inline, using mgaonline (GUI)</p> <img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/mgaonline8.png" alt="mgaonline pop-up" class="screen-copy"> - <p>Just follow the wizard instructions; it will configure Mageia media sources and start the migration.</p> + <p>Just follow the wizard instructions; it will configure the Mageia media sources and start the migration.</p> <img src="Migrate%20from%20Mandriva%20Linux%20to%20Mageia_files/mgaonline2.png" alt="mgaonline pop-up" class="screen-copy"> - <p>As soon as the migration is complete, you should restart your system; and here you are.</p> + <p>After the migration is complete, you should restart your system; and you should be presented by your upgraded system!</p> <br> <h2 id="urpmi">b) Upgrading inline, using urpmi (CLI)</h2> <p>You can also upgrade using <code>urpmi</code> from your favourite terminal emulator, - if you are confortable with it. Here are the steps:</p> + if you are more comfortable using the CLI. Here are the steps:</p> <ul> <li><p>Remove all the existing media sources on your system:</p> <p><code class="term">$ su<br> # urpmi.removemedia -a</code></p></li> <li><p>Add the Mageia online sources:</p> <ul> - <li><p>either directly (this will select a best matching mirror, after your location):</p> + <li><p>Either using the MIRRORLIST (this will select the best matching mirror, according to your geographical location); Note that for this method to work, <b>you must install the mgaonline package first (see above)</b>:</p> <p><code class="term">$ su<br> # urpmi.addmedia --distrib --mirrorlist</code></p> </li> - <li><p>either using a specific media mirror (you can decide from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):</p> + <li><p>Or using a specific media mirror (you can get the <i>mirror_url</i> from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):</p> <p><code class="term">$ su<br> - # urpmi.addmedia --distrib <media_url></code></p> + # urpmi.addmedia --distrib <mirror_url></code></p> </li> </ul> </li> @@ -117,7 +117,7 @@ <div class="yui-u first"><div class="para" style="padding-right: 0;"> <h3>Have a question?</h3> <p>Do not hesitate to join our <a href="irc://irc.freenode.net/#mageia">#mageia</a> - IRC channel on Freenode or go in <a href="http://forums.mageia.org/">our forum</a> + IRC channel on Freenode or posting in <a href="http://forums.mageia.org/">our forum</a> to ask for assistance or details.</p> </div></div>
View Attachment As Raw
Actions:
View
Attachments on
bug 1517
: 502