From 592922d263ef31c47620333f40281f722a5b4e2e Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 17 Nov 2009 18:02:43 +0000
Subject: upmethodology 20091102 (2nov09)

git-svn-id: svn://tug.org/texlive/trunk@16051 c570f23f-e606-0410-a88d-b1316a301751
---
 .../doc/latex/upmethodology/upmethodology-doc.tex  | 791 +++++++++++++++++----
 1 file changed, 661 insertions(+), 130 deletions(-)

(limited to 'Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex')

diff --git a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
index 49377bd8367..44b651927c9 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
+++ b/Master/texmf-dist/doc/latex/upmethodology/upmethodology-doc.tex
@@ -1,33 +1,55 @@
-\documentclass[oneside]{upmethodology-document}
+\documentclass[book]{upmethodology-document}
 
-\usepackage{upmethodology-task}
-\usepackage{upmethodology-code}
-\usepackage{upmethodology-spec}
+\setfrontcover{classic}
+%\UseExtension{setlab}
 
-%\setfrontlayout{modern}
-
-\declaredocument{\LaTeX\ Packages for the Unified Process Methodology}{Official Documentation}{UPM-2007-01}
+\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2007-01}
 
 \initialversion[1.0]{\makedate{11}{04}{2006}}{First release of this example}{\upmpublic}
-\incversion{\makedate{19}{04}{2006}}{Add the mtabular and mtable environments}{\upmpublic}
-\incversion{\makedate{27}{04}{2006}}{Add the package upmethodology-code}{\upmpublic}
-\incversion{\makedate{13}{04}{2007}}{Update the upmethodology-fmt package\newline Adding commands for informed people}{\upmpublic}
-\incversion{\makedate{02}{07}{2007}}{Update the upmethodology-fmt package\newline Adding symbols and text formatting functions\newline Updating footnote functions}{\upmpublic}
+\incversion{\makedate{19}{04}{2006}}{Add mtabular and mtable environments}{\upmpublic}
+\incversion{\makedate{27}{04}{2006}}{Add package upmethodology-code}{\upmpublic}
+\incversion{\makedate{13}{04}{2007}}{Update upmethodology-fmt package\newline Adding macros for informed people}{\upmpublic}
+\incversion{\makedate{02}{07}{2007}}{Update upmethodology-fmt package\newline Adding symbols and text formatting functions\newline Updating footnote functions}{\upmpublic}
 \incversion{\makedate{04}{07}{2007}}{Add front page selection macro}{\upmpublic}
 \incversion{\makedate{07}{07}{2007}}{Add bibliography format macros}{\upmpublic}
+\incversion{\makedate{08}{05}{2009}}{Fixing several mismatchs\newline Adding section of document extensions}{\upmpublic}
+\incversion{\makedate{23}{06}{2009}}{Adding section on upmcaution, upminfo and upquestion environments}{\upmpublic}
+\incversion{\makedate{09}{10}{2009}}{Add nodocumentinfo option in upmethodology-document class}{\upmpublic}
+\incversion{\makedate{23}{10}{2009}}{Add back page package}{\upmpublic}
+\incversion{\makedate{24}{10}{2009}}{Add extension package}{\upmpublic}
+\incversion{\makedate{27}{10}{2009}}{Add extension macros and publication page}{\upmpublic}
+\incversion{\makedate{28}{10}{2009}}{Fixing macro names in the \texttt{upmethodology-fmt} package. Add installation chapter.}{\upmpublic}
+\incversion{\makedate{30}{10}{2009}}{Add document class explanations.}{\upmpublic}
+\incversion{\makedate{02}{11}{2009}}{Add people name formatting macros. \newline Add package dependency list.}{\upmpublic}
+\incversion{\makedate{03}{11}{2009}}{Add comment parameter for document role macros.}{\upmpublic}
+
+\addauthorvalidator*[galland@arakhne.org]{St{\'e}phane}{Galland}{Original Author}
 
-\addauthorvalidator[galland@arakhne.org]{St{\'e}phane}{Galland}
+\setdockeywords{\LaTeX, Methodology Document Style, User Documentation, Extensible}
+
+\setdocabstract{Packages upmethodology permis to write documents according to Unified Process Methodology or other methodology. It was initially wittren by St\'ephane \textsc{Galland} from Systems and Transport laboratory and is distributed by the \arakhneorg website.}
 
 \makeatletter
 \let\VERversion\upm@package@version@ver
 \let\VERfmt\upm@package@fmt@ver
 \let\VERdoc\upm@package@doc@ver
 \let\VERfp\upm@package@fp@ver
+\let\VERbp\upm@package@bp@ver
+\let\VERext\upm@package@ext@ver
 \let\VERtask\upm@package@task@ver
 \let\VERdocclazz\upm@package@docclazz@ver
 \let\VERcode\upm@package@code@ver
 \makeatother
 
+\setpublisher{Arakhn\^e.org Group}
+\setcopyrighter{St\'ephane GALLAND}
+\setprintingaddress{France}
+\defupmlogo{arakhne_org_logo}
+\defupmsmalllogo{small_arakhne_org_logo}
+
+%\tracingmacros=2
+%\tracingcommands=1
+
 \begin{document}
 
 \tableofcontents
@@ -40,19 +62,253 @@
 
 \chapter{Introduction}
 
-This set of package permits to write documents according to the Unifess Process Methodology. It was initially wittren by St\'ephane \textsc{Galland} from the Systems and Transport laboratory\footnote{University of Technology of Belfort-Montb{\'e}liard, France, \href{http://set.utbm.fr/}{http://set.utbm.fr/}}.
+This set of package permits to write documents according to Unified Process Methodology. It was initially wittren by St\'ephane \textsc{Galland} from Systems and Transport laboratory\savefootnote{Systems and Transport Laboratory, University of Technology of Belfort-Montb{\'e}liard, France, \href{http://set.utbm.fr/}{http://set.utbm.fr/}}{foot:setlab} and is distributed by the \arakhneorg website.
 
-The packages are:
+Packages are:
 \begin{itemize}
 \item \texttt{upmethodology-version.sty}: permits to set the version and the status of the document. It also permits to manage the document history;
 \item \texttt{upmethodology-fmt.sty}: provides some usefull functions to format the UP documents;
 \item \texttt{upmethodology-document.sty}: provides functions to manage the project, the subproject and the status of the document;
 \item \texttt{upmethodology-frontpage.sty}: formats and provides a front page for the document;
-\item \texttt{upmethodology-task.sty}: is the \LaTeXe\xspace package that provides commands to manage project's tasks.
+\item \texttt{upmethodology-backpage.sty}: formats and provides a back page for the document;
+\item \texttt{upmethodology-task.sty}: is the \LaTeXe\xspace package that provides macros to manage project's tasks.
 \item \texttt{upmethodology-document.cls}: is the \LaTeXe\xspace class that provides the whole document specification. It is based on \texttt{book} and on the previous packages;
-\item \texttt{upmethodology-code.sty}: provides macros for source code formatting.
+\item \texttt{upmethodology-code.sty}: provides macros for source code formatting;
+\item \texttt{upmethodology-extension.sty}: provides macros for extension mechanism.
+\end{itemize}
+
+
+%###########################################################
+\part{General User Documentation}
+
+\chapter{Download and Installation}
+
+This chapter describes were to download \texttt{tex-upmethodology} and how to install it.
+
+\section{Download}
+
+\texttt{tex-upmethodology} is available on the \arakhneorg website: \url{http://www.arakhne.org/tex-upmethodology/}.
+
+Different types of installation are available: manual installation, Debian packages.
+
+\section{Manual System-wide Installation}
+
+To make \texttt{tex-upmethodology} available to all users, copy the content of the \texttt{tex-upmethodology} archive inside one of your system texmf directory, usually one of:
+\begin{itemize}
+\item \texttt{/usr/share/texmf-texlive/tex/latex/upmethodology},
+\item \texttt{/usr/share/texmf/tex/latex/upmethodology}.
+\end{itemize}
+
+The second is to rebuild the \LaTeX\ databases by invoking on a console (Unix syntax us used): \\
+\texttt{\$> sudo mktexlsr}\\
+\texttt{\$> sudo update-updmap --quiet}\\
+
+\texttt{sudo} is a standard Linux tool which permits to authorized users to temporarely obtain the administration rights.
+
+\section{Manual User-wide Installation}
+
+To make \texttt{tex-upmethodology} available to one user, copy the content of the \texttt{tex-upmethodology} archive inside the \texttt{\$HOME/texmf} directory.
+
+It is not required to rebuild the system-wide \LaTeX\ databases because the user's texmf are dynamically parsed by the \LaTeX\ distributions.
+
+\section{Debian Package Installation}
+
+Debian packages are available on \arakhneorg website: \url{http://www.arakhne.org/download.html}. Please follow the given rules.
+
+\section{Package Dependencies}
+
+This section contains the list of all the package dependencies for the \texttt{upmethodology} packages.
+
+\subsection{upmethdology-backpage.sty}
+
+\texttt{upmethodology-backpage} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{upmethodology-extension}
+\end{itemize}
+
+\subsection{upmethdology-code.sty}
+
+\texttt{upmethodology-code} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\end{itemize}
+
+\subsection{upmethdology-document.cls}
+
+\texttt{upmethodology-document} class depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{a4wide}
+\item \texttt{fancyhdr}
+\item \texttt{upmethodology-document}
+\item \texttt{upmethodology-extension}
+\item \texttt{upmethodology-frontpage}
+\item \texttt{upmethodology-backpage}
+\item \texttt{upmethodology-task}
+\item \texttt{upmethodology-code}
+\item \texttt{upmethodology-spec}
+\item \texttt{url}
+\item \texttt{hyperref}
+\end{itemize}
+
+\subsection{upmethdology-document.sty}
+
+\texttt{upmethodology-document} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{babel}
+\item \texttt{vmargin}
+\item \texttt{upmethodology-extension}
+\item \texttt{upmethodology-fmt}
+\item \texttt{upmethodology-version}
+\end{itemize}
+
+\subsection{upmethdology-extension.sty}
+
+\texttt{upmethodology-extension} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\end{itemize}
+
+\subsection{upmethdology-fmt.sty}
+
+\texttt{upmethodology-fmt} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{graphicx}
+\item \texttt{subfigure}
+\item \texttt{tabularx}
+\item \texttt{multicol}
+\item \texttt{colortbl}
+\item \texttt{picinpar}
+\item \texttt{amsmath}
+\item \texttt{pifont}
+\item \texttt{setspace}
+\item \texttt{txfonts}
+\end{itemize}
+
+\subsection{upmethdology-frontpage.sty}
+
+\texttt{upmethodology-frontpage} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{upmethodology-extension}
+\item \texttt{upmethodology-document}
+\end{itemize}
+
+\subsection{upmethdology-p-common.sty}
+
+\texttt{upmethodology-p-common} package depends on:
+\begin{itemize}
+\item \texttt{ifthen}
+\item \texttt{xspace}
+\item \texttt{color}
+\end{itemize}
+
+\subsection{upmethdology-spec.sty}
+
+\texttt{upmethodology-spec} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{ulem}
+\item \texttt{upmethodology-fmt}
+\item \texttt{upmethodology-code}
+\end{itemize}
+
+\subsection{upmethdology-task.sty}
+
+\texttt{upmethodology-task} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{upmethodology-version}
 \end{itemize}
 
+\subsection{upmethdology-version.sty}
+
+\texttt{upmethodology-version} package depends on:
+\begin{itemize}
+\item \texttt{upmethodology-p-common}
+\item \texttt{upmethodology-fmt}
+\end{itemize}
+
+%###########################################################
+\part{Package Documentation}
+
+\chapter{Class upmethodology-document}
+
+\begin{center}
+	\texttt{Version: \VERdocclazz}
+\end{center}
+
+The \LaTeX\ class \texttt{upmethodology-document} provides the basic configuration for a document. According to an option, this class is able to extend the standard \texttt{book}, \texttt{report} or \texttt{article} \LaTeX\ classes. It also include a snipset of the other \texttt{upmethdology} packages.
+
+\section{Types of documents}\label{section:documentclass:doctype}
+
+\texttt{upmethodology-document} supports three special options which permits to set the type of document:
+\begin{itemize}
+\item \texttt{book}: A book-specification is a two-sided document composed of parts and chapters, and with a copyright page and document information page. This option indicates to \texttt{upmethodology-document} to load the \LaTeX\ standard \texttt{book} class. In addition the \texttt{{\textbackslash}part} and \texttt{{\textbackslash}chapter} macros are supported, and the following macros are automatically expanded: \texttt{{\textbackslash}makefrontcover}, \texttt{{\textbackslash}upmpublicationpage}, \texttt{{\textbackslash}upmdocumentsummary}, \texttt{{\textbackslash}makebackcover}. This behaviour may be overridden by the other class options.
+
+\item \texttt{report}: A report-specification is a one-sided document composed of chapters (no part), and with a document information page. This option indicates to \texttt{upmethodology-document} to load the \LaTeX\ standard \texttt{report} class. In addition the \texttt{{\textbackslash}part} macro is ignored\savefootnote{The macro is redefined to print a warning message when used, no error message is generated.}{ignoretexmacro} and \texttt{{\textbackslash}chapter} macro is supported, and the following macros are automatically expanded: \texttt{{\textbackslash}makefrontcover}, \texttt{{\textbackslash}upmdocumentsummary}, \texttt{{\textbackslash}makebackcover}. This behaviour may be overridden by the other class options.
+
+\item \texttt{article}: An article-specification is a one-sided document composed of sections (no part nor chapter). This option indicates to \texttt{upmethodology-document} to load the \LaTeX\ standard \texttt{article} class. In addition the \texttt{{\textbackslash}part}and \texttt{{\textbackslash}chapter} macros are ignored\reffootnote{ignoretexmacro}, and the following macros are automatically expanded: \texttt{{\textbackslash}makefrontcover}, \texttt{{\textbackslash}makebackcover}. This behaviour may be overridden by the other class options.
+
+\end{itemize}
+
+\section{Class options}
+
+Table~\tabref{documentclassoptions} contains the options supported by \texttt{upmethodology-document}. Any option not explicitely supported by the class is directly pass to the underlying standard \LaTeX\ class (\texttt{book}, \texttt{report} or \texttt{article} according to the type of document, see~\ref{section:documentclass:doctype}).
+
+\begin{mtable}{\linewidth}{2}{|l|X|}{Options of \texttt{upmethodology-document} class}{documentclassoptions}
+\captionastitle
+\tabularheader{Option}{Explanation}
+
+\hline
+
+book & see section~\ref{section:documentclass:doctype}. \\
+\hline
+report & see section~\ref{section:documentclass:doctype}. \\
+\hline
+article & see section~\ref{section:documentclass:doctype}. \\
+
+\hline\hline
+
+oneside & the document is generated assuming that each page will be printed on its recto side. This option overrides any previous occurrence of \texttt{twoside} option. \\
+\hline
+twoside & the document is generated assuming that each page will be printed on both recto and verso sides. This option overrides any previous occurrence of \texttt{oneside} option. \\
+
+\hline\hline
+
+francais & same as \texttt{french}. \\
+\hline
+french & the document is written in French. \texttt{upmethodology} packages use the French translations for the generated texts.  This option overrides any previous occurrence of \texttt{english} option. \\
+\hline
+english & the document is written in English. \texttt{upmethodology} packages use the English translations for the generated texts.  This option overrides any previous occurrence of \texttt{french} option. \\
+
+\hline\hline
+
+documentinfo & invoke \texttt{{\textbackslash}upmdocumentsummary}, \texttt{{\textbackslash}upmdocumentauthors}, \texttt{{\textbackslash}upmdocumentvalidators}, \texttt{{\textbackslash}upmdocumentinformedpeople}, and \texttt{{\textbackslash}upmhistory} macros at the begining of the document. This option overrides any previous occurrence of \texttt{nodocumentinfo} option. \\
+\hline
+nodocumentinfo & do not invoke \texttt{{\textbackslash}upmdocumentsummary}, \texttt{{\textbackslash}upmdocumentauthors}, \texttt{{\textbackslash}upmdocumentvalidators}, \texttt{{\textbackslash}upmdocumentinformedpeople}, nor \texttt{{\textbackslash}upmhistory} macros at the begining of the document. This option overrides any previous occurrence of \texttt{documentinfo} option. \\
+
+\hline\hline
+
+pubpage & invoke \texttt{{\textbackslash}upmpublicationpage} macro at the begining of the document. This option overrides any previous occurrence of \texttt{nopubpage} option. \\
+\hline
+nopubpage & do not invoke \texttt{{\textbackslash}upmpublicationpage} macro at the begining of the document. This option overrides any 
+previous occurrence of \texttt{pubpage} option. \\
+
+\hline
+\end{mtable}
+
+\section{Additional Features}
+
+\texttt{upmethodology-document} provides a constant behaviour for all types of document:
+\begin{itemize}
+\item \texttt{hyperref} is loaded and set with the document informations;
+\item \texttt{{\textbackslash}setpdfcolor} is redefined and linked to \texttt{hyperref};
+\item \texttt{fancyhdr} is loaded and default page header and page footer is provided.
+\end{itemize}
 
 %###########################################################
 
@@ -108,13 +364,13 @@ The package \texttt{upmethodology-version} permits to register revisions for bui
 
 \section{Formatted List of Versions}
 
-To obtain a formatted list of versions, you could use the command \texttt{{\textbackslash}upmhistory[width]} which produces:
+To obtain a formatted list of versions, you could use the macro \texttt{{\textbackslash}upmhistory[width]} which produces:
 
 \upmhistory
 
 \section{Localization}
 
-The following commands defines some localized strings used by \texttt{upmethodology-version}:
+The following macros defines some localized strings used by \texttt{upmethodology-version}:
 \begin{itemize}
 \item \texttt{{\textbackslash}upm@lang@date}: Date;
 \item \texttt{{\textbackslash}upm@lang@updates}: Updates;
@@ -134,13 +390,13 @@ The package \texttt{upmethodology-fmt} provides some usefull facilities to forma
 
 \section{Figures}
 
-You could include afigure inside your document with the following commands: \\
+You could include afigure inside your document with the following macros: \\
 \texttt{{\textbackslash}mfigure[position]\{options\}\{filename\}\{caption\}\{label\}} \\
 \texttt{{\textbackslash}mfigure*[position]\{options\}\{filename\}\{caption\}\{label\}} \\
 
-These two commands permits to include an image in your document.The parameters are:
+These two macros permits to include an image in your document.The parameters are:
 \begin{itemize}
-\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the command location if possible) or \texttt{H} (at command location);
+\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
 
 \item \texttt{options}: are the options passed to \texttt{{\textbackslash}includegraphics};
 
@@ -153,15 +409,15 @@ These two commands permits to include an image in your document.The parameters a
 
 The difference between \texttt{{\textbackslash}mfigure} and \texttt{{\textbackslash}mfigure*} is the same as the difference between \texttt{{\textbackslash}begin\{figure\}} and \texttt{{\textbackslash}begin\{figure*\}}: the star-version fits to the entire paper width event if the document has two or more columns.
 
-Because the two commands abose register a label with string starting with \texttt{fig:}, we propose the following function to easily access to the figure's references:
+Because the two macros abose register a label with string starting with \texttt{fig:}, we propose the following function to easily access to the figure's references:
 \begin{itemize}
 \item \texttt{{\textbackslash}figref\{label\}}: is equivalent to \texttt{{\textbackslash}ref\{fig:label\}};
 \item \texttt{{\textbackslash}figpageref\{label\}}: is equivalent to \texttt{{\textbackslash}pageref\{fig:label\}}.
 \end{itemize}
 
-The figure~\figref{example:mfigure} page~\figpageref{example:mfigure} is obtained with the command: \texttt{{\textbackslash}mfigure[ht]\{width=.6{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure\}\}\{example:mfigure\}}. The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:mfigure\}} and \texttt{{\textbackslash}figpageref\{example:mfigure\}}.
+The figure~\figref{example:mfigure} page~\figpageref{example:mfigure} is obtained with the macro: \texttt{{\textbackslash}mfigure[ht]\{width=.6{\textbackslash}linewidth\}\{slogo\}\{Example of figure inclusion with {\textbackslash}texttt\{\{{\textbackslash}textbackslash\}mfigure\}\}\{example:mfigure\}}. The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:mfigure\}} and \texttt{{\textbackslash}figpageref\{example:mfigure\}}.
 
-\mfigure[ht]{width=.6\linewidth}{logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure}
+\mfigure[ht]{width=.6\linewidth}{arakhne_org_logo}{Example of figure inclusion with \texttt{{\textbackslash}mfigure}}{example:mfigure}
 
 \section{Sub-figures}
 
@@ -173,16 +429,16 @@ In some case, it is usefull to put several images inside the same picture, but w
 ...\\
 {\textbackslash}end\{mfigures*\}} \\
 
-These two commands permits to include an image in your document.The parameters are:
+These two macros permits to include an image in your document.The parameters are:
 \begin{itemize}
-\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the command location if possible) or \texttt{H} (at command location);
+\item \texttt{position}: is the desired position of the figure (see {\textbackslash}begin{figure}[position]). It could be \texttt{t} (top of the page), \texttt{b} (bottom of the page), \texttt{h} (at the macro location if possible) or \texttt{H} (at macro location);
 
 \item \texttt{caption}: is the caption of the figure (see {\textbackslash}caption\{caption\});
 
 \item \texttt{label}: is the label used to reference the figure (see {\textbackslash}label\{fig:label\}).
 \end{itemize}
 
-Inside the environment \texttt{{\textbackslash}mfigures[*]}, you could use the command \texttt{{\textbackslash}mfigure} to properly include a subfigure (the first optional parameter is ignored) or you could use the command \texttt{{\textbackslash}msubfigure\{options\}\{file\}\{caption\}}.
+Inside the environment \texttt{{\textbackslash}mfigures[*]}, you could use the macro \texttt{{\textbackslash}mfigure} to properly include a subfigure (the first optional parameter is ignored) or you could use the macro \texttt{{\textbackslash}msubfigure\{options\}\{file\}\{caption\}}.
 
 The figure~\figref{example:msubfigure} page~\figpageref{example:msubfigure} is obtained with the environment:\\
 \texttt{{\textbackslash}begin\{mfigures\}\{Example of subfigures with {\textbackslash}texttt\{mfigures\}\}\{example:msubfigure\}}\\
@@ -194,9 +450,9 @@ The figure~\figref{example:msubfigure} page~\figpageref{example:msubfigure} is o
 The reference and page reference are obtained with \texttt{{\textbackslash}figref\{example:msubfigure\}} and \texttt{{\textbackslash}figpageref\{example:msubfigure\}}.
 
 \begin{mfigures}{Example of subfigures with \texttt{mfigures}}{example:msubfigure}
-	\mfigure{width=.4\linewidth}{logo}{First subfigure}{example:firstsubfigure}
+	\mfigure{width=.4\linewidth}{arakhne_org_logo}{First subfigure}{example:firstsubfigure}
 	\hfill
-	\msubfigure{width=.4\linewidth}{smalllogo}{Second subfigure}
+	\msubfigure{width=.4\linewidth}{small_arakhne_org_logo}{Second subfigure}
 \end{mfigures}
 
 The references to the subfigures could be obtained in two way:\nopagebreak\begin{itemize}
@@ -204,20 +460,20 @@ The references to the subfigures could be obtained in two way:\nopagebreak\begin
 \item using the label of the enclosing figure to which the index of the subfigure could be appended (in its roman representation and prefixed by the character ``\texttt{:}''), eg. the label \texttt{example:msubfigure:b} corresponds to \figref{example:msubfigure:b};
 \end{itemize}
 
-\section{Figures with embedded \TeX\xspace commands}
+\section{Figures with embedded \TeX\xspace macros}
 
-In several case it is usefull to include \TeX\xspace commands inside a figure. It is possible with the files \texttt{.pstex} exporting from a software such as \texttt{xfig}.
+In several case it is usefull to include \TeX\xspace macros inside a figure. It is possible with the files \texttt{.pstex} exporting from a software such as \texttt{xfig}.
 
-To put a \TeX\xspace command inside your figure, follows the steps:
+To put a \TeX\xspace macro inside your figure, follows the steps:
 \begin{enumerate}
 \item in \texttt{xfig} create a text label with the \emph{special} property set. In this label types the string \texttt{{\textbackslash}FIG$\delta$} where $\delta$ must be replaced by an identifier of your choice but only composed of letters (example: \texttt{{\textbackslash}FIGmyid});
 \item in \texttt{xfig} saves your figure as \texttt{.pstex} files;
-\item in \LaTeX, just before including the figure with the embedded \TeX\xspace commands, define the expressions to put in the figure. This action must be done with one of the commands:
+\item in \LaTeX, just before including the figure with the embedded \TeX\xspace macros, define the expressions to put in the figure. This action must be done with one of the macros:
 	\begin{itemize}
 	\item \texttt{{\textbackslash}figmath\{id\}\{expr\}} will associate to the given identifier the given mathematical expression,
 	\item \texttt{{\textbackslash}figtext\{id\}\{expr\}} will associate to the given identifier the given text expression;
 	\end{itemize}
-\item in \LaTeX, include the figure with one of the commands: \\
+\item in \LaTeX, include the figure with one of the macros: \\
 \texttt{{\textbackslash}mfigurewtex[position]\{width\}\{filename\}\{caption\}\{label\}} \\
 \texttt{{\textbackslash}mfigurewtex*[position]\{width\}\{filename\}\{caption\}\{label\}}
 \end{enumerate}
@@ -240,10 +496,10 @@ This tabular is an extension of the \texttt{tabularx} environment which provides
 The \texttt{mtabular} environment provides:
 \begin{itemize}
 \item \texttt{{\textbackslash}tabulartitle\{title\}} \\
-	this command permits to define the title of the tabular. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively;
+	this macro permits to define the title of the tabular. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively;
 
 \item \texttt{{\textbackslash}tabularheader\{$header_1$\}...\{$header_n$\}} \\
-	this command permits to define the titles of the columns. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively. Because the count of columns was given to the environment this function takes the same count of parameters as the count of columns.
+	this macro permits to define the titles of the columns. It uses the colors \texttt{backtableheader} and \texttt{fronttableheader} for the background and the foreground respectively. Because the count of columns was given to the environment this function takes the same count of parameters as the count of columns.
 \end{itemize}
 
 The following example of table is obtained by: \\
@@ -303,16 +559,16 @@ The table~\tabref{example:mtable} page~\tabpageref{example:mtable} is an illustr
 	e & f & g & h \\
 \end{mtable}
 
-The command \texttt{{\textbackslash}captionastitle} is equivalent to a call to the macro \texttt{{\textbackslash}tabulartitle} with the caption in parameter.
+The macro \texttt{{\textbackslash}captionastitle} is equivalent to a call to the macro \texttt{{\textbackslash}tabulartitle} with the caption in parameter.
 
 
 \section{Enumerations}
 
-The package \texttt{upmethodology-fmt} provides a set of commands dedicated to enumeration lists.
+The package \texttt{upmethodology-fmt} provides a set of macros dedicated to enumeration lists.
 
 \subsection{Enumeration Counters}
 
-Sometimes it is usefull to start an enumeration list from a specifical given number. This package provides several commands for saving and restoring the counter use by the enumeration lists.
+Sometimes it is usefull to start an enumeration list from a specifical given number. This package provides several macros for saving and restoring the counter use by the enumeration lists.
 
 Caution: only once counter could be saved at a given time.
 
@@ -348,7 +604,7 @@ And it is produced by the \LaTeX~code: \\
 
 \section{Footnotes}
 
-The package \texttt{upmethodology-fmt} provides a set of commands allowing to save the reference number of a footnote and to recall this reference many time as required.
+The package \texttt{upmethodology-fmt} provides a set of macros allowing to save the reference number of a footnote and to recall this reference many time as required.
 
 \begin{itemize}
 \item \texttt{{\textbackslash}savefootnote\{footnote text\}\{footnote id\}} \\
@@ -356,13 +612,19 @@ The package \texttt{upmethodology-fmt} provides a set of commands allowing to sa
 	Example: \texttt{{\textbackslash}savefootnote\{This is an example of a recallable footnote\}\{footrecalla\}}\savefootnote{This is an example of a recallable footnote}{footrecalla};
 \item \texttt{{\textbackslash}savefootnote*\{footnote text\}\{footnote id\}} \\
 	mark a footnote with the corresponding label but do not put in the current page. \\
-	Example: \texttt{{\textbackslash}savefootnote*\{This is a second example of a recallable footnote\}\{footrecallb\}}\savefootnote*{This is a second example of a recallable footnote}{footrecallb};
+	Example 1: \texttt{{\textbackslash}savefootnote*\{This is a second example of a recallable footnote\}\{footrecallb\}}\savefootnote*{This is a second example of a recallable footnote}{footrecallb}; \\
+	Example 2: \texttt{{\textbackslash}savefootnote*\{This is a third example of a recallable footnote\}\{footrecallc\}}\savefootnote*{This is a third example of a recallable footnote}{footrecallc}.
 \item \texttt{{\textbackslash}reffootnote\{footnote id\}} \\
 	recall the footnote reference without page number. \\
-	Example: \texttt{{\textbackslash}reffootnote\{footrecalla\}}\reffootnote{footrecalla}.
+	Example 1: \texttt{{\textbackslash}reffootnote\{footrecalla\}}\reffootnote{footrecalla}$=B$; \\
+	example 2: \texttt{{\textbackslash}reffootnote\{footrecallb\}}\reffootnote{footrecallb}$=A$; \\
+	example 4: \texttt{{\textbackslash}reffootnote\{footrecalld\}}\reffootnote{footrecalld}$=?$.
 \item \texttt{{\textbackslash}reffootnote*\{footnote id\}} \\
 	recall the footnote reference with the page number if different of the current page. \\
-	Example: \texttt{{\textbackslash}reffootnote*\{footrecallb\}}\reffootnote*{footrecallb}.
+	Example 1: \texttt{{\textbackslash}reffootnote*\{footrecalla\}}\reffootnote*{footrecalla}; \\
+	example 2: \texttt{{\textbackslash}reffootnote*\{footrecallb\}}\reffootnote*{footrecallb}; \\
+	example 3: \texttt{{\textbackslash}reffootnote*\{footrecallc\}}\reffootnote*{footrecallc}; \\
+	example 4: \texttt{{\textbackslash}reffootnote*\{footrecalld\}}\reffootnote*{footrecalld}.
 \end{itemize}
 
 \section{UML diagrams on the side of paragraphs}
@@ -374,7 +636,7 @@ The package \texttt{upmethodology-fmt} provides an environment which permits to
 	put the specified picture on the side of the given text. The optional parameter \texttt{width} corresponds to the desired width ofthe picture. By default it is \texttt{.5{\textbackslash}linewidth}.
 \end{itemize}
 
-\begin{umlinpar}{smalllogo}
+\begin{umlinpar}{small_arakhne_org_logo}
 	This paragraph is an typical example of the usage of the environment \texttt{umlinpar}. To obtain it, the following \LaTeX\ code was typed: \\
 \texttt{{\textbackslash}begin\{umlinpar\}\{smalllogo\}} \\
 \texttt{This paragraph is an typical example of the usage of the environment {\textbackslash}texttt\{umlinpar\}.} \\
@@ -412,7 +674,7 @@ extract the day field from a date respecting the localized date format.
 
 \section{Text formatting}
 
-The package \texttt{upmethodology-fmt} provides a set of commands to format the text.
+The package \texttt{upmethodology-fmt} provides a set of macros to format the text.
 
 \begin{itemize}
 \item \texttt{{\textbackslash}textsup\{text\}} \\
@@ -422,10 +684,49 @@ The package \texttt{upmethodology-fmt} provides a set of commands to format the
 	put a text as indice in text mode instead of the basic \LaTeX indice in math mode. \\
 	Example: \texttt{{\textbackslash}textsub\{this is an indice\}}\textsub{this is an indice};
 \item \texttt{{\textbackslash}makename[von]\{first name\}\{last name\}} \\
-	format the specified peoople name components according to the document standards. By default, the format \texttt{first von last} is used. \\
-	Example: \texttt{{\textbackslash}makename\{St\'ephane\}\{Galland\}}, \makename{St\'ephane}{Galland};
+	format the specified people name components according to the document standards. By default, the format \texttt{first von last} is used. \\
+	Example: \texttt{{\textbackslash}makename[von]\{Ludwig Otto Frederik Wilhelm\}\{Wittelsbach\}},\\
+		``\makename[von]{Ludwig Otto Frederik Wilhelm}{Wittelsbach}'';
+\item \texttt{{\textbackslash}upmmakename[von]\{first name\}\{last name\}\{separator\}} \\
+	format the specified people name components according to the document standards. By default, the format \texttt{first von last} is used. \\
+	Example: \texttt{{\textbackslash}upmmakename[von]\{Ludwig Otto Frederik Wilhelm\}\{Wittelsbach\}\{/\}}, \\
+		``\upmmakename[von]{Ludwig Otto Frederik Wilhelm}{Wittelsbach}{/}'';
+\item \texttt{{\textbackslash}prname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}prname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Professor} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}prname\{Pierre\}\{Martin\}}, ``\prname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}prname*\{Pierre\}\{Martin\}}, ``\prname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}drname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}drname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Doctor} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}drname\{Pierre\}\{Martin\}}, ``\drname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}drname*\{Pierre\}\{Martin\}}, ``\drname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}phdname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}phdname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Philosophi\ae Doctor} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}phdname\{Pierre\}\{Martin\}}, ``\phdname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}phdname*\{Pierre\}\{Martin\}}, ``\phdname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}scdname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}scdname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Scienti\ae Doctor} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}scdname\{Pierre\}\{Martin\}}, ``\scdname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}scdname*\{Pierre\}\{Martin\}}, ``\scdname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}mdname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}mdname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Medicin\ae Doctor} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}mdname\{Pierre\}\{Martin\}}, ``\mdname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}mdname*\{Pierre\}\{Martin\}}, ``\mdname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}pengname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}pengname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Professional/Chartered Engineer} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}pengname\{Pierre\}\{Martin\}}, ``\pengname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}pengname*\{Pierre\}\{Martin\}}, ``\pengname*{Pierre}{Martin}'';
+\item \texttt{{\textbackslash}iengname[von]\{first name\}\{last name\}} \\
+      \texttt{{\textbackslash}iengname*[von]\{first name\}\{last name\}} \\
+	format the specified people name components according to the document standards for \emph{Incorporated Engineer} title. By default, the format \texttt{first von last} is used. The star-ed version is post-fixed, the non-star-ed version is prefixed. \\
+	Example 1: \texttt{{\textbackslash}iengname\{Pierre\}\{Martin\}}, ``\iengname{Pierre}{Martin}''; \\
+	Example 2: \texttt{{\textbackslash}iengname*\{Pierre\}\{Martin\}}, ``\iengname*{Pierre}{Martin}''.
 \end{itemize}
-
 \section{Symbols}
 
 The package \texttt{upmethodology-fmt} provides several symbols described inside the table~\ref{tab:symbols}.
@@ -434,16 +735,17 @@ The package \texttt{upmethodology-fmt} provides several symbols described inside
 	\begin{center}
 		\begin{tabular}{|>{\ttfamily}l|l|}
 		\hline
+		{\textbackslash}arakhneorg & \arakhneorg \\
 		{\textbackslash}copyright & \copyright \\
 		{\textbackslash}trademark & \trademark \\
 		{\textbackslash}regmark & \regmark \\
 		{\textbackslash}smalltrade & \smalltrade \\
 		{\textbackslash}smallreg & \smallreg \\
 		{\textbackslash}smallcopy & \smallcopy \\
-		{\textbackslash}st & \st \\
-		{\textbackslash}nd & \nd \\
-		{\textbackslash}rd & \rd \\
-		{\textbackslash}th & \th \\
+		{\textbackslash}ust & \ust \\
+		{\textbackslash}und & \und \\
+		{\textbackslash}urd & \urd \\
+		{\textbackslash}uth & \uth \\
 		\hline
 		\end{tabular}
 	\end{center}
@@ -453,7 +755,7 @@ The package \texttt{upmethodology-fmt} provides several symbols described inside
 
 \section{Bibliography}
 
-The package \texttt{upmethodology-fmt} provides a set of commands allowing to manage the bibliography. The default bibliography style is \texttt{abbr}.
+The package \texttt{upmethodology-fmt} provides a set of macros allowing to manage the bibliography. The default bibliography style is \texttt{abbr}.
 
 \begin{itemize}
 \item \texttt{{\textbackslash}bibliographystyle\{style\}} \\
@@ -464,9 +766,107 @@ The package \texttt{upmethodology-fmt} provides a set of commands allowing to ma
 	Example: \texttt{{\textbackslash}bibliography\{mybib\}};
 \item \texttt{{\textbackslash}bibsize\{size\}} \\
 	set the font size used for the bibliography section. \\
-	Example: \texttt{{\textbackslash}bibsize\{\Huge\}};
+	Example: \texttt{{\textbackslash}bibsize\{{\textbackslash}Huge\}};
 \end{itemize}
 
+\section{Framed Mini Pages}
+
+Standard \LaTeX\ distribution provides the \texttt{minipage} environment. This environment permits to put a small piece of page inside your document. Package \texttt{upmethodology-fmt} provides a framed extension of the original \texttt{minipage} environment:
+\par
+\begin{tabularx}{\linewidth}{XX}
+\texttt{{\textbackslash}begin\{framedminipage\}{[}{\textbackslash}linewidth{]}} \newline
+\texttt{This is an example of a framed minipage.} \newline
+\texttt{{\textbackslash}end\{framedminipage\}}
+&
+\begin{framedminipage}{\linewidth}This is an example of a framed minipage.\end{framedminipage}
+\\
+\end{tabularx}
+
+\section{Message Boxes}
+
+The package \texttt{upmethodology-fmt} provides a set of environment to put emphasis message boxes in the text. Three types of boxes are supported: caution, information, and question.
+
+\par
+\begin{tabularx}{\linewidth}{XX}
+
+\texttt{{\textbackslash}begin\{upmcaution\}{[}width{]}} \newline
+\texttt{This is an example of a caution message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{{\textbackslash}end\{upmcaution\}}
+&
+\begin{upmcaution}This is an example of a caution message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upmcaution}
+\\
+	
+\texttt{{\textbackslash}begin\{upminfo\}{[}width{]}} \newline
+\texttt{This is an example of an information message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{{\textbackslash}end\{upminfo\}}
+&
+\begin{upminfo}This is an example of an information message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upminfo}
+\\
+
+\texttt{{\textbackslash}begin\{upmquestion\}{[}width{]}} \newline
+\texttt{This is an example of a question message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.} \newline
+\texttt{{\textbackslash}end\{upmquestion\}}
+&
+\begin{upmquestion}This is an example of a question message. This text must be rendered with enough height (usually 2 lines of text) to avoid intersection between the caution icon and the box frame.\end{upmquestion}
+\\
+
+\end{tabularx}
+
+\section{Additional Document Sectionning Macros}
+
+The package \texttt{upmethodology-fmt} provides several macros that permit to create special sections.
+
+\subsection{Non-numbered Part in Table of Content}
+
+If you want to add a document part that has no part number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}part} and \texttt{{\textbackslash}part*} are inefficient. Indeed, \texttt{{\textbackslash}part} is adding a numbered part inside the table of content, and \texttt{{\textbackslash}part*} is adding an unnumbered part but not inside the table of content.
+
+To add a unnumbered part inside the table of content, you could use one of the macros: \\
+\texttt{{\textbackslash}parttoc[toctitle]\{title\}} \\
+\texttt{{\textbackslash}parttoc*[toctitle]\{title\}}
+
+The macros \texttt{{\textbackslash}parttoc} and \texttt{{\textbackslash}parttoc*} have the same effect except that \texttt{{\textbackslash}parttoc*} aligns the part's title to the other numbered parts' titles; and \texttt{{\textbackslash}parttoc} not.
+
+\subsection{Non-numbered Chapter in Table of Content}
+
+If you want to add a document chapter that has no chapter number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}chapter} and \texttt{{\textbackslash}chapter*} are inefficient. Indeed, \texttt{{\textbackslash}chapter} is adding a numbered chapter inside the table of content, and \texttt{{\textbackslash}chapter*} is adding an unnumbered chapter but not inside the table of content.
+
+To add a unnumbered chapter inside the table of content, you could use one of the macros: \\
+\texttt{{\textbackslash}chaptertoc[toctitle]\{title\}} \\
+\texttt{{\textbackslash}chaptertoc*[toctitle]\{title\}}
+
+The macros \texttt{{\textbackslash}chaptertoc} and \texttt{{\textbackslash}chaptertoc*} have the same effect except that \texttt{{\textbackslash}chaptertoc*} aligns the chapter's title to the other numbered chapters' titles; and \texttt{{\textbackslash}chaptertoc} not.
+
+\subsection{Non-numbered Section in Table of Content}
+
+If you want to add a document section that has no a section number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}section} and \texttt{{\textbackslash}section*} are inefficient. Indeed, \texttt{{\textbackslash}section} add a numbered section inside the table of content, and \texttt{{\textbackslash}section*} adds an unnumbered section but not inside the table of content.
+
+To add a unnumbered section inside the table of content, you could use one of the macros: \\
+\texttt{{\textbackslash}sectiontoc[toctitle]\{title\}} \\
+\texttt{{\textbackslash}sectiontoc*[toctitle]\{title\}}
+
+The macros \texttt{{\textbackslash}sectiontoc} and \texttt{{\textbackslash}sectiontoc*} have the same effect except that \texttt{{\textbackslash}sectiontoc*} aligns the section's title to the other numbered sections' titles; and \texttt{{\textbackslash}sectiontoc} not.
+
+\subsection{Non-numbered Subsection in Table of Content}
+
+If you want to add a document subsection that has no subsection number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}subsection} and \texttt{{\textbackslash}subsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsection} is adding a numbered subsection inside the table of content, and \texttt{{\textbackslash}subsection*} is adding an unnumbered subsection but not inside the table of content.
+
+To add a unnumbered subsection inside the table of content, you could use one of the macros: \\
+\texttt{{\textbackslash}subsectiontoc[toctitle]\{title\}} \\
+\texttt{{\textbackslash}subsectiontoc*[toctitle]\{title\}}
+
+The macros \texttt{{\textbackslash}subsectiontoc} and \texttt{{\textbackslash}subsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsectiontoc*} aligns the subsection's title to the other numbered subsections' titles; and \texttt{{\textbackslash}subsectiontoc} not.
+
+\subsection{Non-numbered Subsubsection in Table of Content}
+
+If you want to add a document subsubsection that has no subsubsection number but appearing inside the table of content, the classical \LaTeX\ macros \texttt{{\textbackslash}subsubsection} and \texttt{{\textbackslash}subsubsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsubsection} is adding a numbered subsubsection inside the table of content, and \texttt{{\textbackslash}subsubsection*} is adding an unnumbered subsubsection but not inside the table of content.
+
+To add a unnumbered subsubsection inside the table of content, you could use one of the macros: \\
+\texttt{{\textbackslash}subsubsectiontoc[toctitle]\{title\}} \\
+\texttt{{\textbackslash}subsubsectiontoc*[toctitle]\{title\}}
+
+The macros \texttt{{\textbackslash}subsubsectiontoc} and \texttt{{\textbackslash}subsubsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsubsectiontoc*} aligns the subsubsection's title to the other numbered subsubsections' titles; and \texttt{{\textbackslash}subsubsectiontoc} not.
+
+
 %###########################################################
 
 \chapter{Package upmethodology-document}
@@ -499,15 +899,37 @@ where the parameters are:
 \item \texttt{ref} is the reference number of the document.
 \end{itemize}
 
+\section{Abstract and Key-words}
+
+You are able to declare the abstract and the key-words for your document. Both are basically used by the back page package.
+
+\subsection{Declarations}
+
+The macro \texttt{{\textbackslash}setdocabstract} is for entering the docment's abstract:\\
+\texttt{{\textbackslash}setdocabstract{[}lang{]}\{abstract\_text\}} \\
+where \texttt{abstract\_text} is the text of your abstract and \texttt{lang} designates for which language the abstract text is for. If the language is not specified, this macro uses the current document language.
+
+The macro \texttt{{\textbackslash}setdockeywords} is for entering the docment's key-words:\\
+\texttt{{\textbackslash}setdockeywords{[}lang{]}\{keywords\}} \\
+where \texttt{keywords} is the list of key-words and \texttt{lang} designates for which language the key-words are for. If the language is not specified, this macro uses the current document language.
+
+\subsection{Rendering}
+
+The macro \texttt{{\textbackslash}theupmdocabstract} is expanded with the abstract text:\\
+\texttt{{\textbackslash}theupmdocabstract}
+
+The macro \texttt{{\textbackslash}theupmdockeywords} is expanded with the key-words:\\
+\texttt{{\textbackslash}theupmdockeywords}
+
 \section{Document Summary}
 
-You can obtain a documet summary with the command \texttt{{\textbackslash}upmdocumentsummary[width]} which produces:
+You can obtain a document summary with the macro \texttt{{\textbackslash}upmdocumentsummary{[}width{]}} which produces:
 
 \upmdocumentsummary
 
 \section{Change Icons}
 
-By default, this package uses the logo of the laboratory Systems and Transport as icons. You could change them with the commands:
+By default, this package uses the logo of \arakhneorg as icons. You could change them with the macros:
 
 \begin{itemize}
 \item \texttt{{\textbackslash}defupmsmalllogo\{filename\}} defines the small logo used in the headers for instance;
@@ -520,7 +942,9 @@ The logos' filenames are accessible with the functions \texttt{{\textbackslash}t
 
 An author is someone who participates to the writing of the document. You could register author identities with: \\
 \texttt{{\textbackslash}addauthor[email]\{firstname\}\{name\}} \\
-\texttt{{\textbackslash}addauthorvalidator[email]\{firstname\}\{name\}}
+\texttt{{\textbackslash}addauthor*[email]\{firstname\}\{name\}\{comment\}} \\
+\texttt{{\textbackslash}addauthorvalidator[email]\{firstname\}\{name\}} \\
+\texttt{{\textbackslash}addauthorvalidator*[email]\{firstname\}\{name\}\{comment\}}
 
 The list of the authors is accessible by two means:
 \begin{itemize}
@@ -534,7 +958,9 @@ The list of the authors is accessible by two means:
 
 A validator is someone who participates to the validation of the document. You could register validator identities with: \\
 \texttt{{\textbackslash}addvalidator[email]\{firstname\}\{name\}} \\
-\texttt{{\textbackslash}addauthorvalidator[email]\{firstname\}\{name\}}
+\texttt{{\textbackslash}addvalidator*[email]\{firstname\}\{name\}\{comment\}} \\
+\texttt{{\textbackslash}addauthorvalidator[email]\{firstname\}\{name\}} \\
+\texttt{{\textbackslash}addauthorvalidator*[email]\{firstname\}\{name\}\{comment\}}
 
 The list of the validators is accessible by two means:
 \begin{itemize}
@@ -547,7 +973,8 @@ The list of the validators is accessible by two means:
 \section{Informed People}
 
 An informed people is someone who receives the document to be informed about its content. You could register informed people identities with: \\
-\texttt{{\textbackslash}addinformed[email]\{firstname\}\{name\}}
+\texttt{{\textbackslash}addinformed[email]\{firstname\}\{name\}} \\
+\texttt{{\textbackslash}addinformed*[email]\{firstname\}\{name\}\{comment\}}
 
 The list of the informed people is accessible by two means:
 \begin{itemize}
@@ -557,63 +984,53 @@ The list of the informed people is accessible by two means:
 
 \upmdocumentinformedpeople
 
-\section{Document Sectionning}
-
-The package \texttt{upmethodology-document} provides several commands that permit to create special sections:
-
-\subsection{Part Sectionning}
-
-If you want to add a document part that has no a part number but appearing inside the table of content, the classical \LaTeX\ commands \texttt{{\textbackslash}part} and \texttt{{\textbackslash}part*} are inefficient. Indeed, \texttt{{\textbackslash}part} add a numbered part inside the table of content, and \texttt{{\textbackslash}part*} adds an unnumbered part but not inside the table of content.
-
-To add a unnumbered part inside the table of content, you could use one of the commands: \\
-\texttt{{\textbackslash}parttoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}parttoc*[toctitle]\{title\}}
-
-The commands \texttt{{\textbackslash}parttoc} and \texttt{{\textbackslash}parttoc*} have the same effect except that \texttt{{\textbackslash}parttoc*} aligns the part's title to the other numbered parts' titles; and \texttt{{\textbackslash}parttoc} not.
-
-\subsection{Chapter Sectionning}
+\section{Copyright and Publication Information}
 
-If you want to add a document chapter that has no a chapter number but appearing inside the table of content, the classical \LaTeX\ commands \texttt{{\textbackslash}chapter} and \texttt{{\textbackslash}chapter*} are inefficient. Indeed, \texttt{{\textbackslash}chapter} add a numbered chapter inside the table of content, and \texttt{{\textbackslash}chapter*} adds an unnumbered chapter but not inside the table of content.
+Package \texttt{upmethodology-document} provides several macros to define the copyright owner and the publication informations required to generate a publication page.
 
-To add a unnumbered chapter inside the table of content, you could use one of the commands: \\
-\texttt{{\textbackslash}chaptertoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}chaptertoc*[toctitle]\{title\}}
+\subsection{Setting Information}
 
-The commands \texttt{{\textbackslash}chaptertoc} and \texttt{{\textbackslash}chaptertoc*} have the same effect except that \texttt{{\textbackslash}chaptertoc*} aligns the chapter's title to the other numbered chapters' titles; and \texttt{{\textbackslash}chaptertoc} not.
+Copyrighter is the people or the institution, or both, which is owning the copyright on the document. The following macro permits to set the identify of the copyighter in all the parts of the documents: \\
+\texttt{{\textbackslash}setcopyrighter\{name\}}\\
 
-\subsection{Section Sectionning}
+Publisher is the people or the institution, or both, which is publishing the document. Basically it is the same the copyrighter (see above): \\
+\texttt{{\textbackslash}setpublisher\{name\}}\\
 
-If you want to add a document section that has no a section number but appearing inside the table of content, the classical \LaTeX\ commands \texttt{{\textbackslash}section} and \texttt{{\textbackslash}section*} are inefficient. Indeed, \texttt{{\textbackslash}section} add a numbered section inside the table of content, and \texttt{{\textbackslash}section*} adds an unnumbered section but not inside the table of content.
+Some times, copyright laws depend on the location where the document is printed. The following macro permits to put a message in the publication page which is indicating where the document is printed: \\
+\texttt{{\textbackslash}setprintingaddress\{address\}}\\
 
-To add a unnumbered section inside the table of content, you could use one of the commands: \\
-\texttt{{\textbackslash}sectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}sectiontoc*[toctitle]\{title\}}
+Publications may be identifier by international identifiers. Package \texttt{upmethodology-document} supports ISBN, ISSN and DOI:
+\texttt{{\textbackslash}setisbn\{number\}}\\
+\texttt{{\textbackslash}setissn\{number\}}\\
+\texttt{{\textbackslash}setdoi\{number\}}\\
 
-The commands \texttt{{\textbackslash}sectiontoc} and \texttt{{\textbackslash}sectiontoc*} have the same effect except that \texttt{{\textbackslash}sectiontoc*} aligns the section's title to the other numbered sections' titles; and \texttt{{\textbackslash}sectiontoc} not.
+\subsection{Retreiving Information}
 
-\subsection{Subsection Sectionning}
+The information set by the macros described in the previous section may be retreived with the following macros: \\
+\texttt{{\textbackslash}theupmcopyrighter}\\
+\texttt{{\textbackslash}theupmpublisher}\\
+\texttt{{\textbackslash}theupmprintedin}\\
+\texttt{{\textbackslash}theupmisbn}\\
+\texttt{{\textbackslash}theupmissn}\\
+\texttt{{\textbackslash}theupmdoi}\\
 
-If you want to add a document subsection that has no a subsection number but appearing inside the table of content, the classical \LaTeX\ commands \texttt{{\textbackslash}subsection} and \texttt{{\textbackslash}subsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsection} add a numbered subsection inside the table of content, and \texttt{{\textbackslash}subsection*} adds an unnumbered subsection but not inside the table of content.
+\subsection{Publication Page}
 
-To add a unnumbered subsection inside the table of content, you could use one of the commands: \\
-\texttt{{\textbackslash}subsectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}subsectiontoc*[toctitle]\{title\}}
+The package \texttt{upmethodology-document} provides the \texttt{{\textbackslash}upmpublicationpage} macro which is displaying a empty page with publication informations and optionally set the page number (default value is $-1$). Figure~\ref{fig:publication:page} illustrates the publication page of this document.
 
-The commands \texttt{{\textbackslash}subsectiontoc} and \texttt{{\textbackslash}subsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsectiontoc*} aligns the subsection's title to the other numbered subsections' titles; and \texttt{{\textbackslash}subsectiontoc} not.
-
-\subsection{Subsubsection Sectionning}
-
-If you want to add a document subsubsection that has no a subsubsection number but appearing inside the table of content, the classical \LaTeX\ commands \texttt{{\textbackslash}subsubsection} and \texttt{{\textbackslash}subsubsection*} are inefficient. Indeed, \texttt{{\textbackslash}subsubsection} add a numbered subsubsection inside the table of content, and \texttt{{\textbackslash}subsubsection*} adds an unnumbered subsubsection but not inside the table of content.
-
-To add a unnumbered subsubsection inside the table of content, you could use one of the commands: \\
-\texttt{{\textbackslash}subsubsectiontoc[toctitle]\{title\}} \\
-\texttt{{\textbackslash}subsubsectiontoc*[toctitle]\{title\}}
-
-The commands \texttt{{\textbackslash}subsubsectiontoc} and \texttt{{\textbackslash}subsubsectiontoc*} have the same effect except that \texttt{{\textbackslash}subsubsectiontoc*} aligns the subsubsection's title to the other numbered subsubsections' titles; and \texttt{{\textbackslash}subsubsectiontoc} not.
+\begin{figure}
+	\begin{center}
+		\begin{framedminipage}{.8\linewidth}
+		\upmpublicationminipage % in place of \upmpublicationpage to avod page number and page style changes
+		\end{framedminipage}
+		\caption{Example of Publication Page generated with \texttt{{\textbackslash}upmpublicationpage}}
+		\label{fig:publication:page}
+	\end{center}
+\end{figure}
 
 \section{Localization}
 
-The following commands defines some localized strings used by \texttt{upmethodology-document}:
+The following macros defines some localized strings used by \texttt{upmethodology-document}:
 \begin{itemize}
 \item \texttt{{\textbackslash}upm@lang@project}: Project;
 \item \texttt{{\textbackslash}upm@lang@document}: Document;
@@ -624,7 +1041,9 @@ The following commands defines some localized strings used by \texttt{upmethodol
 \item \texttt{{\textbackslash}upm@lang@document@validators}: Validators;
 \item \texttt{{\textbackslash}upm@lang@document@names}: Names;
 \item \texttt{{\textbackslash}upm@lang@document@emails}: Emails;
-\item \texttt{{\textbackslash}upm@lang@document@initials}: Initials.
+\item \texttt{{\textbackslash}upm@lang@document@initials}: Initials;
+\item \texttt{{\textbackslash}upm@lang@document@abstract}: Abstract;
+\item \texttt{{\textbackslash}upm@lang@document@keywords}: Key-words.
 \end{itemize}
 
 
@@ -636,11 +1055,17 @@ The following commands defines some localized strings used by \texttt{upmethodol
 	\texttt{Version: \VERfp}
 \end{center}
 
-The package \texttt{upmethodology-frontpage} provides an front page for the UP documents. This package does not provides any public function. It is based on all the previous packages.
+The \texttt{upmethodology-frontpage} package provides an front page for the UP documents. This package does not provides any public function. It is based on all the previous packages.
+
+\section{Display the front page}
+
+The front cover is displayed by invoking one of the following macros: \\
+\texttt{{\textbackslash}maketitle} \\
+\texttt{{\textbackslash}makefrontcover} \\
 
 \section{Change Front Page Layout}
 
-It is possible to change the layout of the front page with the command: \\
+It is possible to change the layout of the front page with the macro: \\
 \texttt{{\textbackslash}setfrontlayout\{layout\_name\}}\\
 where \texttt{layout\_name} must be one of:
 \begin{itemize}
@@ -660,32 +1085,148 @@ The figure~\figref{frontpage:layout} illustrates the differents layouts.
 
 \section{Change Illustration Picture}
 
-It is possible to insert an illustration picture on the front page. You could specify the image with the command: \\
+It is possible to insert an illustration picture on the front page. You could specify the image with the macro: \\
 \texttt{{\textbackslash}setfrontillustration[width\_factor]\{filename\}} \\
 where:
 \begin{itemize}
-\item \texttt{width\_actor} is the scaling factor of the picture according to the line width. If you specifies \texttt{1} the image will not be scaled, for \texttt{.5} the image will be the half of its original width...
+\item \texttt{width\_factor} is the scaling factor of the picture according to the line width. If you specifies \texttt{1} the image will not be scaled, for \texttt{.5} the image will be the half of its original width...
 \item \texttt{filename} is the name of picture to use as the illustration.
 \end{itemize}
 
+\section{Define a Front Page in Extensions}
+
+The \texttt{upmethodology-frontpage} package is able to use a page layout defined in a document extension (see chapter~\ref{section:document:extension} for details on document extension).
+
+\pagebreak A \LaTeX\ macro must be defined in the \texttt{upmext-NAME.cfg} file of the extension. The name of this macro (for example \texttt{mylayout}) must be set with the \texttt{{\textbackslash}set} macro in the same file:\\
+\texttt{{\textbackslash}set\{frontpage\}\{mylayout\}}\\
+
 \section{Localization}
 
-The following commands defines some localized strings used by \texttt{upmethodology-frontpage}:
+The following macros defines some localized strings used by \texttt{upmethodology-frontpage}:
 \begin{itemize}
 \item \texttt{{\textbackslash}upm@lang@front@authors}: Authors;
 \end{itemize}
 
 %###########################################################
 
+\chapter{Package upmethodology-backpage}
+
+\begin{center}
+	\texttt{Version: \VERbp}
+\end{center}
+
+The package \texttt{upmethodology-backpage} provides an back page for the UP documents. This package does not provides any public function. It is based on all the previous packages.
+
+\section{Display the back page}
+
+The back cover is displayed by invoking the following macro: \\
+\texttt{{\textbackslash}makebackcover} \\
+
+\section{Change Back Page Layout}
+
+It is possible to change the layout of the back page with the macro: \\
+\texttt{{\textbackslash}setbacklayout\{layout\_name\}}\\
+where \texttt{layout\_name} must be one of:
+\begin{itemize}
+\item \texttt{none}: no back page.
+\end{itemize}
+
+\section{Define a Back Page in Extensions}
+
+The \texttt{upmethodology-backpage} package is able to use a page layout defined in a document extension (see chapter~\ref{section:document:extension} for details on document extension).
+
+A \LaTeX\ macro must be defined in the \texttt{upmext-NAME.cfg} file of the extension. The name of this macro (for example \texttt{mylayout}) must be set with the \texttt{{\textbackslash}set} macro in the same file:\\
+\texttt{{\textbackslash}set\{backpage\}\{mylayout\}}\\
+
+
+%###########################################################
+
+\chapter{Package upmethodology-extension}\label{section:document:extension}
+
+\begin{center}
+	\texttt{Version: \VERext}
+\end{center}
+
+The package \texttt{upmethodology-extension} provides tools to create layout and rendering extensions.
+It is possible to write an extension to the \texttt{upmethodology-document} package. An extension is able to override several values from the default \texttt{upmethodology-}packages or may be used by the other suite's packages. For example, the Systems and Transport laboratory\reffootnote*{foot:setlab} extension is providing laboratory's icons, publisher's name and page layouts.
+
+\section{Load a Document Extension}
+
+To load and use a document extension, you must invoke the macro:\\
+\texttt{{\textbackslash}upmuse\{extension\_name\}}\\
+where \texttt{extension\_name} is the identifier of the extension to load. The extension's files must be inside your \LaTeX\ search path.
+
+\section{Write a Document Extension}
+
+An document extension must be written and described inside a file named \texttt{upmext-NAME.cfg}, where \texttt{NAME} is the name of the extension. This file must be put in your \LaTeX\ search path.
+
+The \texttt{upmext-NAME.cfg} file is a \LaTeX\ file in which a set of definition macros are put. These macros must respect the \LaTeX\ syntax.
+
+The \texttt{{\textbackslash}DeclaraCopyright} macro permits to declare several copyright information about the extension: \\
+\texttt{{\textbackslash}DeclareCopyright{[}lang{]}\{extension\_name\}\{year\}\{copyrighter\}\{trademark and copyright information\}} \\
+
+This macro declares the \texttt{copyright} value which contains the copyright text (for this documentation ``\Get{copyright}'').
+This macro also declares the \texttt{trademarks} value which contains the trademark and other related informations about the extension (for this documentation ``\Get{trademarks}'').
+
+Additional macros are provided to redefine the \texttt{upmethodology-document} constants:\\
+\texttt{{\textbackslash}Set{[}lang{]}\{variable\_name\}\{value\}}\\
+
+The \texttt{variable\_name} is the name of the value to override. It must be taken in one of the names listed in table~\tabref{documentextension:names:set}. The \texttt{lang} parameter is a language identifier. It is used to restrict the definition to a specific language. If not given, the default language is used insteed. The \texttt{image\_name} and \texttt{image\_scale} are the name of the image file and the scaling factor respectively.
+
+\begin{mtable}{\linewidth}{2}{lX}{List of overiddable value names}{documentextension:names:set}
+	\tabularheader{Value Name}{Description}
+	\hline
+	logo & the filename of the picutre which must be used as a large logo. \\
+	\hline
+	smalllogo & the filename of the picutre which must be used as a small logo. \\
+	\hline
+	copyrighter & the name of the authors or the institution which own the copyright on the document. \\
+	\hline
+	publisher & the name of the document's publisher. The \texttt{lang} parameter is supported. \\
+	\hline
+	printedin & the location/address where this document is printed. \\
+	\hline
+	frontillustration & the image to use as illustration. The \texttt{lang} parameter is ignored. \\
+	\hline
+	frontpage & the name of the front page style --- not the \LaTeX\ macros --- to layout the front page. \newline OR \newline the front page illustration.\\
+	\hline
+	backpage & the \LaTeX\ macros to layout the back page.  \newline OR \newline the back page illustration.\\
+	\hline
+	cfrontpage & the \LaTeX\ macros --- not the name of the front page style --- to layout the front page.\\
+	\hline
+\end{mtable}
+
+The \texttt{{\textbackslash}Get} macro permits to retreive the value defined by a \texttt{{\textbackslash}Set}:\\
+\texttt{{\textbackslash}Get\{variable\_name\}} \\
+
+The \texttt{{\textbackslash}Unset} macro permits to remove the definition of a value:\\
+\texttt{{\textbackslash}Unset\{variable\_name\}} \\
+
+The \texttt{{\textbackslash}Ifnotempty} macro permits to expand the \LaTeX\ macros if the given text is not empty:\\
+\texttt{{\textbackslash}Ifnotempty\{text\}\{latex\_code\}} \\
+
+The \texttt{{\textbackslash}Ifempty} macro permits to expand the \LaTeX\ macros if the given text is empty:\\
+\texttt{{\textbackslash}Ifempty\{text\}\{latex\_code\}} \\
+
+The \texttt{{\textbackslash}Ifelsedefined} macro permits to expand the \LaTeX\ macros in \texttt{then\_code} if a value with the given name was defined, or to expand the \LaTeX\ macros in \texttt{else\_code} if no value with the given name was defined:\\
+\texttt{{\textbackslash}Ifelsedefined\{value\_name\}\{then\_code\}\{else\_code\}} \\
+
+The \texttt{{\textbackslash}Put} macro is an extension of the standard picture \texttt{{\textbackslash}put} macro. It takes into account the joint margin applied in two sided documents when it is used on page's backside (eg. the back page of the document):\\
+\texttt{{\textbackslash}Put(x,y)\{macros\}} \\
+
+This macro must be used inside a \texttt{picture} environment in place of the standard \texttt{{\textbackslash}put} macro.
+
+%###########################################################
+
 \chapter{Package upmethodology-task}
 
 \begin{center}
 	\texttt{Version: \VERtask}
 \end{center}
 
-The \LaTeX\ package \texttt{upmethodology-task} provides a set of commands to define project's tasks.
+The \LaTeX\ package \texttt{upmethodology-task} provides a set of macros to define project's tasks.
 
-This package could log the message "\verb+Project Task(s) may have changed. Rerun to get cross-references right+" when some task information was not found or due to cross-references on them.
+During \LaTeX\ compilation this package could log the message \texttt{"Project Task(s) may have changed. Rerun to get cross-references right"} when some task information was not found or due to cross-references on them.
 
 \section{Task Definition}
 
@@ -696,7 +1237,7 @@ where \texttt{id} is the identifier of the task.
 
 The environment \texttt{taskdefinion} displays the task's description with a call to \texttt{{\textbackslash}thetaskdescription\{id\}}. In the opposite \texttt{taskdefinition*} never displays the ta's description.
 
-Inside one of the task's definition environment above, you could use one of the following commands to define the task's attributes:
+Inside one of the task's definition environment above, you could use one of the following macros to define the task's attributes:
 \begin{itemize}
 \item \texttt{{\textbackslash}taskname\{name\}} \\
 	permits to defines the name of the task;
@@ -722,7 +1263,7 @@ Inside one of the task's definition environment above, you could use one of the
 
 You could reference any information about the defined tasks in your document. In case you used cross-references this package could log the message "\verb+Project Task(s) may have changed. Rerun to get cross-references right+" to complain about rebuilding of our document.
 
-The following commands are available:
+The following macros are available:
 \begin{itemize}
 \item \texttt{{\textbackslash}thetasksuper\{id\}} \\
 	replies the identifier of the parent task corresponding to the task identified by \texttt{id};
@@ -750,7 +1291,7 @@ The following commands are available:
 
 \section{Localization}
 
-The following commands defines some localized strings used by \texttt{upmethodology-task}:
+The following macros defines some localized strings used by \texttt{upmethodology-task}:
 \begin{itemize}
 \item \texttt{{\textbackslash}upm@task@lang@task}: Task;
 \item \texttt{{\textbackslash}upm@task@lang@escription}: Description;
@@ -765,25 +1306,13 @@ The following commands defines some localized strings used by \texttt{upmethodol
 
 %###########################################################
 
-\chapter{Class upmethodology-document}
-
-\begin{center}
-	\texttt{Version: \VERdocclazz}
-\end{center}
-
-The \LaTeX\ class \texttt{upmethodology-document} provides an extension of the class \texttt{book} dedicated to the UP documents. This class automatically add a front page, a document summary, an author's list, a validator's list and a version history.
-
-It also provides a default formatting of the headers of the pages.
-
-%###########################################################
-
 \chapter{Package upmethodology-code}
 
 \begin{center}
 	\texttt{Version: \VERcode}
 \end{center}
 
-The \LaTeX\ package \texttt{upmethodology-code} provides a set of commands for source code formatting. The supported source codes are UML, Java and C++.
+The \LaTeX\ package \texttt{upmethodology-code} provides a set of macros for source code formatting. The supported source codes are UML, Java and C++.
 
 You could load the package with the following options:
 \begin{center}
@@ -796,13 +1325,13 @@ cpp & use the C++ notation \\
 \end{tabular}
 \end{center}
 
-You could also change the notation language with the command: \\
+You could also change the notation language with the macro: \\
 \texttt{{\textbackslash}upmcodelang\{upm\string|java\string|cpp\}}
 
-The provided commands are listed in the following table: \\
+The provided macros are listed in the following table: \\
 \begin{tabularx}{\linewidth}{|>{\ttfamily}l|X|X|X|}
 	\hline
-	{\normalfont Command} & UML & Java & C++ \\
+	{\normalfont macro} & UML & Java & C++ \\
 	\hline
 	\multicolumn{4}{|X|}{Prototypes} \\
 	\hline
@@ -830,7 +1359,7 @@ The provided commands are listed in the following table: \\
 \newpage
 \begin{tabularx}{\linewidth}{|>{\ttfamily}l|X|X|X|}
 	\hline
-	{\normalfont Command} & UML & Java & C++ \\
+	{\normalfont macro} & UML & Java & C++ \\
 	\hline
 	\multicolumn{4}{|X|}{Constants} \\
 	\hline
@@ -845,6 +1374,8 @@ The provided commands are listed in the following table: \\
 	\hline
 \end{tabularx}
 
+%###########################################################
+
 \chapter{Authors and License}
 
 Copyright \copyright\ \upmcopyrightdate\ \makename{St\'ephane}{Galland}
-- 
cgit v1.2.3

