Merge pull request #997 from FHenry/3.4

3.4
Dolibarr · May 28, 2013 · c4b12a6 · c4b12a6
2 parents 485c7bc + 8a726ab
commit c4b12a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -223,10 +223,9 @@ function dol_getprefix()
 
 /**
  *	Make an include_once using default root and alternate root if it fails.
- *	WARNING: In most cases, you should not use this function:
  *  To link to a core file, use include(DOL_DOCUMENT_ROOT.'/pathtofile')
  *  To link to a module file from a module file, use include './mymodulefile';
- *  To link to a module file from a core file, then this function can be used
+ *  To link to a module file from a core file, then this function can be used (call by hook / trigger / speciales pages)
  *
  * 	@param	string	$relpath	Relative path to file (Ie: mydir/myfile, ../myfile, ...)
  * 	@param	string	$classname	Class name

diff --git a/...rvices/demo_wsclient_actioncomm.php-NORUN → .../webservices/demo_wsclient_actioncomm.php b/...rvices/demo_wsclient_actioncomm.php-NORUN → .../webservices/demo_wsclient_actioncomm.php