diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 55bc292704a..b9f273ba629 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -141,18 +141,18 @@ $dolibarr_main_db_type=''; // Database character set used to store data (forced during database creation). // Default value: depends on database driver // Examples: -// dolibarr_main_db_character_set='latin1'; +// dolibarr_main_db_character_set='utf8'; // -$dolibarr_main_db_character_set='latin1'; +$dolibarr_main_db_character_set='utf8'; // dolibarr_main_db_collation // Database character set used to sort data (forced during database creation). // Default value: depends on database driver // Examples: -// dolibarr_main_db_collation='latin1_swedish_ci'; +// dolibarr_main_db_collation='utf8_general_ci'; // -$dolibarr_main_db_collation='latin1_swedish_ci'; +$dolibarr_main_db_collation='utf8_general_ci'; @@ -183,13 +183,12 @@ $dolibarr_main_authentication='dolibarr'; // $dolibarr_main_auth_ldap_host='127.0.0.1'; // $dolibarr_main_auth_ldap_port='389'; // $dolibarr_main_auth_ldap_version='3'; -// $dolibarr_main_auth_ldap_servertype='openldap'; // openldap, activedirectory or egroupware +// $dolibarr_main_auth_ldap_servertype='openldap'; // openldap, activedirectory or egroupware // $dolibarr_main_auth_ldap_login_attribute='loginfield'; // Ex: uid or samaccountname for active directory -// $dolibarr_main_auth_ldap_dn='ou=users,dc=my-domain,dc=com'; // Ex: ou=users,dc=my-domain,dc=com -// $dolibarr_main_auth_ldap_filter = ''; // If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com). -// $dolibarr_main_auth_ldap_admin_login=''; // Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com -// $dolibarr_main_auth_ldap_admin_pass=''; // Required only if anonymous bind disabled. Ex: secret - +// $dolibarr_main_auth_ldap_dn='ou=users,dc=my-domain,dc=com'; // Ex: ou=users,dc=my-domain,dc=com +// $dolibarr_main_auth_ldap_filter = ''; // If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com). +// $dolibarr_main_auth_ldap_admin_login=''; // Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com +// $dolibarr_main_auth_ldap_admin_pass=''; // Required only if anonymous bind disabled. Ex: secret // $dolibarr_main_auth_ldap_debug='false'; @@ -245,21 +244,21 @@ $dolibarr_main_prod='0'; // dolibarr_main_limit_users // Can set a limit on the number of users it will be possible to create -// (the superadmin not included), can be used for a restricted mode. +// (the superadmin not included). Can be used for a restricted mode. // Default value: 0 (unlimited) // Examples: // $dolibarr_main_limit_users='0'; // dolibarr_mailing_limit_sendbyweb -// Can set a limit for mailing send by web, can be used for a restricted mode. +// Can set a limit for mailing send by web. Can be used for a restricted mode. // Default value: 0 (use database value if exist) // Examples: // $dolibarr_mailing_limit_sendbyweb='0'; -//############################## -// Path to external libraries -//############################## +//################################# +// Path to external libraries/fonts +//################################# // Value to overwrite path to use shared libraries instead of embedded one //$dolibarr_lib_ADODB_PATH='/usr/share/php/adodb'; @@ -275,19 +274,13 @@ $dolibarr_main_prod='0'; //$dolibarr_js_JQUERY='/javascript/jquery'; //$dolibarr_js_JQUERY_UI='/javascript/jquery-ui'; //$dolibarr_js_JQUERY_FLOT='/javascript/flot'; - - -//############################## -// Path to external font -//############################## - // Value to overwrite some path to use font instead of embedded one //$dolibarr_font_DOL_DEFAULT_TTF="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"; //$dolibarr_font_DOL_DEFAULT_TTF_BOLD="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"; //############################## -// Extrernal module +// External module //############################## // multicompany_transverse_mode @@ -299,4 +292,4 @@ $dolibarr_main_prod='0'; // Examples: // $multicompany_transverse_mode='1'; -?> +?> \ No newline at end of file