Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

README.md

@@ -140,15 +140,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 ### Other general features
 
 - Localization in most major languages
+- Multi-Language Support
 - Multi-Users and groups with finely grained rights
-- Multi-currency
-- Multi-company by adding of an external module
+- Multi-Currency
+- Multi-Company (by adding of an external module)
+
 - Very user friendly and easy to use
 - customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 
-- APIs
+- APIs (REST, SOAP)
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
+
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF
   - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)

build/README

@@ -1,48 +1,62 @@
 README (English)
+
+Path: /dolibarr/build/README
+
 ##################################################
 Building packages
 ##################################################
 
 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
-There are several tools:
 
+There are several tools:
 
 
 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl
 
-Note: Prerequisites to build tgz, debian, rpm package
+--------------------------------------------------------------------------------------------------
+
+
+Prerequisites to build tgz, debian, rpm package:
+
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
-Note: Prerequisites to build autoexe DoliWamp package:
+
+--------------------------------------------------------------------------------------------------
+
+Prerequisites to build autoexe DoliWamp package:
 > apt-get install wine q4wine
 > 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)
+   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
 > 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.
+   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
+   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
 > 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.