From 5e2494a82c30faeb8da08bf929990967453a629d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 13 Sep 2020 13:17:21 +0200
Subject: [PATCH] Update doc

---
 build/README                   | 32 ++++++++++++++++++++++----------
 build/pdf/README.txt           | 13 +++++++------
 build/sitemap/urllist-wiki.txt |  2 +-
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/build/README b/build/README
index a621e4cb9e5..f7e8ebfe60b 100644
--- a/build/README
+++ b/build/README
@@ -19,28 +19,34 @@ Note: Prerequisites to build autoexe DoliWamp package:
 > Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
    For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
-> Install WampServer into "C:\Program Files\Wamp" to have Apache and MariaDB
+> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
    For example by running wampserver3.2.0_x64.exe (http://www.wampserver.com). See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
-> To build from Windows (running from makepack-dolibarr.pl script is however
-  recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
 > Add path to ISCC into PATH windows var:
   Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+  open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.
+
+
   
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
+
+
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl
 
+
+
 - To build developper documentation, launch the script
 > perl dolibarr-doxygen-build.pl
 
 
+
 Note: 
-The build directory and all its contents is absolutely not required to make
-Dolibarr working. It is here only to build Dolibarr packages, and those
-generated packages will not contains this "build" directory.
+The build directory and all its contents is absolutely not required to make Dolibarr working. 
+It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
 
 
 You can find in "build", following sub-directories:
@@ -57,6 +63,9 @@ To build Mac OS package (not ready yet).
 * doap:
 To build Doap descriptor to promote/describe Dolibarr releases.
 
+* docker:
+To deploy Dolibarr with docker.
+
 * doxygen:
 Dir with config file to build doxygen documentation.
 
@@ -64,12 +73,12 @@ Dir with config file to build doxygen documentation.
 To build exe package for Windows that distribute Dolibarr sources or
 to build the complete DoliWamp package.
 
+* gource:
+To build the video of history of git changes.
+
 * launchpad:
 Doc file to explain how to use launchpad.
 
-* live:
-Doc file to explain how to create a demo live CD.
-
 * obs:
 Doc file to explain how to push release onto OBS.
 
@@ -88,5 +97,8 @@ To build Redhat, Opensuse or Mandriva package.
 * tgz:
 To build a tgz package.
 
+* travis-ci:
+Used by travis to make CI.
+
 * zip:
 To build a zip package.
diff --git a/build/pdf/README.txt b/build/pdf/README.txt
index 2335ff4b7f7..7a5424ca3d5 100644
--- a/build/pdf/README.txt
+++ b/build/pdf/README.txt
@@ -1,9 +1,10 @@
-To make htmldoc working from wiki.dolibarr.org, them must be modified to have
+To make htmldoc working from wiki.dolibarr.org, the wiki must be modified to have
 
-$_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
-$_COOKIE["htmldoc"] may also be defined if set on command line.
-
-To disable part, add 
-class="htmldoc-ignore" with css
+To disable part of content, add: 
+class="htmldoc-ignore" 
+with css
 .htmldoc-ignore { display: none; }
 
+Note:
+$_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
+$_COOKIE["htmldoc"] may also be defined if set on command line.
diff --git a/build/sitemap/urllist-wiki.txt b/build/sitemap/urllist-wiki.txt
index ae13bb96d87..2a70e61f146 100644
--- a/build/sitemap/urllist-wiki.txt
+++ b/build/sitemap/urllist-wiki.txt
@@ -1 +1 @@
-http://wiki.dolibarr.org/
+https://wiki.dolibarr.org/