diff --git a/doc/dev/.cvsignore b/doc/dev/.cvsignore index 83d0b530094..eda44f75ea9 100644 --- a/doc/dev/.cvsignore +++ b/doc/dev/.cvsignore @@ -1,3 +1,4 @@ comptahtml compta dolibarr-doxygen2.conf +html diff --git a/doc/dev/dolibarr-doxygen.conf b/doc/dev/dolibarr-doxygen.conf index 4c4d79d20d3..28e4b66755a 100644 --- a/doc/dev/dolibarr-doxygen.conf +++ b/doc/dev/dolibarr-doxygen.conf @@ -526,7 +526,8 @@ INPUT = htdocs # into libc) for the transcoding. See http://www.gnu.org/software/libiconv for # the list of possible encodings. -INPUT_ENCODING = UTF-8 +#INPUT_ENCODING = UTF-8 +INPUT_ENCODING = ISO-8859-1 # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -651,7 +652,8 @@ IMAGE_PATH = doc/images # Works on Linux only #INPUT_FILTER = doc/dev/dolibarr-doxygen-filter.pl -INPUT_FILTER = +#INPUT_FILTER = "perl doc/dev/dolibarr-doxygen-filter.pl" +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the diff --git a/htdocs/html.formadmin.class.php b/htdocs/html.formadmin.class.php index d8697bcbb09..bf8c2e39c19 100644 --- a/htdocs/html.formadmin.class.php +++ b/htdocs/html.formadmin.class.php @@ -19,14 +19,14 @@ /** \file htdocs/html.formadmin.class.php - \brief Fichier de la classe des fonctions pr�d�finie de composants html pour les pages admin + \brief File of class for html functions for admin pages \version $Id$ */ /** \class FormAdmin - \brief Classe permettant la g�n�ration de composants html pour les pages admin + \brief Class to generate html code for admin pages */ class FormAdmin { diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php index df6479a0c9f..35e917e46f0 100644 --- a/htdocs/includes/modules/modECM.class.php +++ b/htdocs/includes/modules/modECM.class.php @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** \defgroup ecm Electronic Content Management - \brief Module for ECM. +/** \defgroup ecm Module ECM + \brief Module for ECM (Electronic Content Management) \version $Id$ */ diff --git a/htdocs/product.class.php b/htdocs/product.class.php index 0312cb50ea9..1c80e1433b0 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2007 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007 Jean Heimburger @@ -31,8 +31,8 @@ require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); /** - \class Product - \brief Classe permettant la gestion des produits pr�d�finis + * \class Product + * \brief Class to manage products and services */ class Product extends CommonObject {