From de552679ef3b53dd0bdc592bc13880316db6ec21 Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Mon, 30 May 2011 13:27:00 +0000
Subject: updates

---
 en/1/migrate/index.php       |  24 +++++++++++++++++-------
 g/1/images/desktop_1.jpg     | Bin 0 -> 339162 bytes
 g/1/mgaonline/.directory     |   4 ++++
 g/1/mgaonline/mgaonline2.png | Bin 0 -> 41147 bytes
 g/1/mgaonline/mgaonline3.png | Bin 0 -> 40563 bytes
 g/1/mgaonline/mgaonline4.png | Bin 0 -> 41059 bytes
 g/1/mgaonline/mgaonline5.png | Bin 0 -> 31787 bytes
 g/1/mgaonline/mgaonline6.png | Bin 0 -> 19404 bytes
 g/1/mgaonline/mgaonline8.png | Bin 0 -> 8631 bytes
 9 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 g/1/images/desktop_1.jpg
 create mode 100644 g/1/mgaonline/.directory
 create mode 100644 g/1/mgaonline/mgaonline2.png
 create mode 100644 g/1/mgaonline/mgaonline3.png
 create mode 100644 g/1/mgaonline/mgaonline4.png
 create mode 100644 g/1/mgaonline/mgaonline5.png
 create mode 100644 g/1/mgaonline/mgaonline6.png
 create mode 100644 g/1/mgaonline/mgaonline8.png

diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php
index ebe3eba37..77f4cfdc4 100644
--- a/en/1/migrate/index.php
+++ b/en/1/migrate/index.php
@@ -66,14 +66,24 @@ $_t = array(
                     for Mandriva Linux<br> 2010.1 or 2010.2</a></p>
                 
                 <br>
-                <h2 id="mgaonline">Upgrading inline, using mgaonline (GUI)</h2>
-                <p>Just launch <code>mgaapplet</code>.</p>
-                
-                <p>It will notify you of the availability of the new Mageia 1 distribution,
-                    configure Mageia media sources and start the migration.</p>
-                
+                <p>Note that you may get a security warning, due to invalid package signature.
+                    Yes, that sucks, we know.
+                    But that's what we got so far.</p>
+                    
+                <p>So, it installed the package? Good, let's move on and pick a) or b) below:</p>
+                <br>
+                <h2 id="mgaonline">a) Upgrading inline, using mgaonline (GUI)</h2>
+                <p>Just close your graphical session and log in again.
+                    A pop-up window will notify you of the availability of the new Mageia 1 distribution:</p>
+                <img src="/g/1/mgaonline/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>
+                <img src="/g/1/mgaonline/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>
+
                 <br>
-                <h2 id="urpmi">Upgrading inline, using urpmi (CLI)</h2>
+                <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>
                 <ul>
diff --git a/g/1/images/desktop_1.jpg b/g/1/images/desktop_1.jpg
new file mode 100644
index 000000000..56587210a
Binary files /dev/null and b/g/1/images/desktop_1.jpg differ
diff --git a/g/1/mgaonline/.directory b/g/1/mgaonline/.directory
new file mode 100644
index 000000000..3afa0678c
--- /dev/null
+++ b/g/1/mgaonline/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2011,5,23,22,38,31
+Version=2
diff --git a/g/1/mgaonline/mgaonline2.png b/g/1/mgaonline/mgaonline2.png
new file mode 100644
index 000000000..27be77af1
Binary files /dev/null and b/g/1/mgaonline/mgaonline2.png differ
diff --git a/g/1/mgaonline/mgaonline3.png b/g/1/mgaonline/mgaonline3.png
new file mode 100644
index 000000000..49bb04a06
Binary files /dev/null and b/g/1/mgaonline/mgaonline3.png differ
diff --git a/g/1/mgaonline/mgaonline4.png b/g/1/mgaonline/mgaonline4.png
new file mode 100644
index 000000000..26a3024e0
Binary files /dev/null and b/g/1/mgaonline/mgaonline4.png differ
diff --git a/g/1/mgaonline/mgaonline5.png b/g/1/mgaonline/mgaonline5.png
new file mode 100644
index 000000000..4886bd8ec
Binary files /dev/null and b/g/1/mgaonline/mgaonline5.png differ
diff --git a/g/1/mgaonline/mgaonline6.png b/g/1/mgaonline/mgaonline6.png
new file mode 100644
index 000000000..9a8b7ee13
Binary files /dev/null and b/g/1/mgaonline/mgaonline6.png differ
diff --git a/g/1/mgaonline/mgaonline8.png b/g/1/mgaonline/mgaonline8.png
new file mode 100644
index 000000000..057697b6a
Binary files /dev/null and b/g/1/mgaonline/mgaonline8.png differ
-- 
cgit v1.2.1