aboutsummaryrefslogtreecommitdiffstats
path: root/en
diff options
context:
space:
mode:
authorManuel Hiebel <leuhmanu@mageia.org>2013-11-01 10:01:02 +0000
committerManuel Hiebel <leuhmanu@mageia.org>2013-11-01 10:01:02 +0000
commit4fa894be96b8a1ab1345e4633411c34ba0190017 (patch)
tree113d049b53e13d7dca0a39f96f6e7de343ab0ae7 /en
parent0a53a4b8e3b468f61c0181ea74a7fe23e3966795 (diff)
downloadwww-4fa894be96b8a1ab1345e4633411c34ba0190017.tar
www-4fa894be96b8a1ab1345e4633411c34ba0190017.tar.gz
www-4fa894be96b8a1ab1345e4633411c34ba0190017.tar.bz2
www-4fa894be96b8a1ab1345e4633411c34ba0190017.tar.xz
www-4fa894be96b8a1ab1345e4633411c34ba0190017.zip
added a warning that netinstall iso way not work (suggested by marja)
Diffstat (limited to 'en')
-rwxr-xr-xen/4/download_index.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/en/4/download_index.php b/en/4/download_index.php
index 0e71b6b50..07f29469c 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -139,6 +139,7 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<h2><?php _e('LiveCDs and LiveDVDs');?></h2>
<p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
<span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!'); ?></span>
+ <?php /*_e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));*/?></p>
<table class="fr-table dlt2">
<thead>
<tr>
@@ -203,7 +204,8 @@ function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $me
<div class="para">
<h2><?php _e('Wired Network-based Installation CD')?></h2>
- <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?></p>
+ <p class="dlinfo"><?php _e('Download quickly and immediately boot into install mode from <em>wired</em> network or a local disk.')?>
+ <span class="warn"><?php _e("These ISOs change frequently, and as it give real state of Cauldron, they may not work. If it's the case, use above one."); ?></span></p>
<table class="fr-table dlt2">
<thead>