From a29d57476d8c9419aff1333d3dd32659159f5a15 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Sun, 16 Jul 2017 00:38:32 +0200
Subject: Documentation for Mageia 6 is available

(html version of netinstall is missing)
---
 en/doc/doc.php                       |  8 ++++++-
 en/doc/index.php                     | 13 ++++++++++++
 en/downloads/get/definitions_doc.ini | 41 ++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 en/doc/index.php
 mode change 100644 => 100755 en/downloads/get/definitions_doc.ini

(limited to 'en')

diff --git a/en/doc/doc.php b/en/doc/doc.php
index 44205c2b1..06eaad398 100755
--- a/en/doc/doc.php
+++ b/en/doc/doc.php
@@ -1,5 +1,11 @@
 <?php
 
+
+$documentation['installer'     ][6] = array('ca','cs','da','de','el','en','es','et','eu','fr','id','it','nl','pl','pt','pt_br','ro','ru','sl','sq','sv','tr','uk','zh_CN');
+$documentation['control_center'][6] = array('ca','cs','de','el','en','es','et','eu','fr','id','it','nl','pl','pt','pt_br','ro','ru','sv','tr','uk');
+$documentation['draklive'      ][6] = array('cs','de','el','en','es','et','eu','fr', 'hr','nl','pt_br','ro','sk','sl','sv','uk','zh_CN');
+$documentation['netinstall'    ][6] = array('ca','cs','da','de','el','en','es','et','eu','fr','id','it','nl','pl','pt','pt_br','ro','ru','sl','sq','sv','tr','uk','zh_CN');
+
 $documentation['installer'     ][5] = array('ca','cs','de','el','en','eo','es','et','eu','fr', 'hr','id','it','nl', 'pl','pt','pt_br','ro','ru','sq','sv','tr','uk','zh_CN');
 $documentation['control_center'][5] = array('ca','cs','de','el','en','es','et','eu','fr','id','it','nl','pl','pt','pt_br','ro','ru','sv','tr','uk');
 $documentation['draklive'      ][5] = array('cs','de','el','en','es','et','eu','fr', 'hr','nl','ro','sk','sl','sv','uk','zh_CN');
@@ -58,7 +64,7 @@ function doc_list($documentation_name, $type, $version)
         $dir   = 'draklive';
         $name  = 'DrakLive';
         $title = _r('Installation from LIVE medium');
-    } else if ('draklive' == $type) {
+    } else if ('netinstall' == $type) {
         $dir   = 'NetInstall';
         $name  = 'NetInstall';
         $title = _r('Installation with tiny boot image');
diff --git a/en/doc/index.php b/en/doc/index.php
old mode 100644
new mode 100755
index f321dd9d8..28a51dfdc
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -34,6 +34,19 @@ require 'doc.php';
                     <?php _g('Feel free to help us improving it!')?></p>
                     <?php _g('Documentation built using the <a href="%s">Calenco tool from NeoDoc</a>.', 'http://www.neodoc.biz/', 'p')?>
                     <hr>
+                    <h3>Mageia 6</h3>
+                    <div class="row">
+                    <div class="col">
+                        <?php doc_list(_r('Installer'), 'installer', 6); ?>
+                    </div>
+                    <div class="col">
+                        <?php doc_list(_r('Control Center'), 'control_center', 6); ?>
+                    </div>
+                    <div class="col">
+                        <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 6); ?>
+                    </div>
+                    </div><!--row-->
+                    <hr></hr>
                     <h3>Mageia 5</h3>
                     <div class="row">
                     <div class="col">
diff --git a/en/downloads/get/definitions_doc.ini b/en/downloads/get/definitions_doc.ini
old mode 100644
new mode 100755
index 5c953f82e..da6da5f9d
--- a/en/downloads/get/definitions_doc.ini
+++ b/en/downloads/get/definitions_doc.ini
@@ -49,3 +49,44 @@ langs = "de|en|et|fr|pt_br|ro|ru|tr|uk"
 size  = around 10 MB
 path  = people/marcom/doc/mga5/pdf/mcc
 langs = "de|en|et|fr|pt_br|ro|ru|tr|uk"
+
+; Mageia 6
+[Mageia6_DrakX_en_epub]
+size  = around 2 MB
+path  = doc/mga6/epub/DrakX
+langs = "ca|cs|de|el|en|eo|es|et|eu|fr|hr|id|it|nb|nl|pl|pt_br|ro|ru|sl|sq|sv|tr|uk|zh_cn"
+
+[Mageia6_DrakX_en_pdf]
+size  = around 2 MB
+path  = doc/mga6/pdf/DrakX
+langs = "ca|cs|de|el|en|eo|es|et|eu|fr|hr|id|it|ja|nb|nl|pl|pt_br|ro|ru|sk|sl|sq|sv|tr|uk|zh_cn"
+
+[Mageia6_MCC_en_epub]
+size  = around 10 MB
+path  = doc/mga6/epub/MCC
+langs = "ca|cs|da|de|el|en|et|fr|pt_br|ro|ru|sl|tr|uk|zh_cn"
+
+[Mageia6_MCC_en_pdf]
+size  = around 10 MB
+path  = doc/mga6/pdf/MCC
+langs = "ca|cs|de|el|en|et|eu|fr|id|it|ja|pl|pt_br|ro|ru|sl|sq|sl|tr|uk|zh_cn"
+
+[Mageia6_DrakLive_en_epub]
+size  = around 10 MB
+path  = doc/mga6/epub/DrakLive
+langs = "cs|de|en|et|eu|fr|hr|nb|nl|pt_br|ro|ru|sl|sv|tr|uk"
+
+[Mageia6_DrakLive_en_pdf]
+size  = around 10 MB
+path  = doc/mga6/pdf/DrakLive
+langs = "ca|cs|de|el|en|eo|es|et|eu|fr|hr|id|it|ja|nb|nl|pl|pt_br|ro|ru|sk|sl|sq|sv|tr|uk|zh_cn"
+
+[Mageia6_NetInstall_en_epub]
+size  = around 10 MB
+path  = doc/mga6/epub/NetInstall
+langs = "ca|cs|de|el|es|et|eu|fr|nb|nl|pt_br|sv|tg|tr|uk|zh_cn"
+
+[Mageia6_NetInstall_en_pdf]
+size  = around 10 MB
+path  = doc/mga6/pdf/NetInstall
+langs = "cs|de|el|es|et|eu|fr|hr|hu|nb|sv|tg|tr|uk|zh_cn"
-- 
cgit v1.2.1