From d909a4b595d3fe98b65640da9eeba6238b178241 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 22 Jan 2010 16:29:45 +0000 Subject: [PATCH] Merged revisions 53734,53736 via svnmerge from svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch ........ r53734 | stayeb | 2010-01-22 16:45:00 +0100 (Fri, 22 Jan 2010) | 1 line Typo. ........ r53736 | teillaud | 2010-01-22 17:05:39 +0100 (Fri, 22 Jan 2010) | 2 lines bug fix ........ --- Installation/CHANGES | 2 +- Manual/doc_tex/Manual/manual-3.6.bib | 2 +- .../latex_converter_config/html/Biblio/how_to_cite_cgal.bib | 6 +++--- .../html/Biblio/how_to_cite_cgal.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Installation/CHANGES b/Installation/CHANGES index bf3a0c79f5b..5dad111f76a 100644 --- a/Installation/CHANGES +++ b/Installation/CHANGES @@ -85,7 +85,7 @@ CGAL 3.6 offers the following improvements and new functionality :

3D Mesh Generation

- - The mesh generator has been enriched which an optimization phase to + - The mesh generator has been enriched with an optimization phase to provide 3D meshes with well shaped tetrahedra (and in particular no slivers). The optimization phase involves four different optimization processes: two global optimization processes (ODT anf Lloyd), a diff --git a/Manual/doc_tex/Manual/manual-3.6.bib b/Manual/doc_tex/Manual/manual-3.6.bib index 98c1dbdfdf5..64e17ff5cda 100644 --- a/Manual/doc_tex/Manual/manual-3.6.bib +++ b/Manual/doc_tex/Manual/manual-3.6.bib @@ -66,7 +66,7 @@ , publisher = "{CGAL Editorial Board}" , edition = "{3.6}" , booktitle = "{CGAL} User and Reference Manual" -, url = "http://www.cgal.org/Manual/3.6/doc_html/cgal_manual/packages.html#Pkg:AlgebraicFoundations" +, url = "http://www.cgal.org/Manual/3.6/doc_html/cgal_manual/packages.html#Pkg:AlgebraicKerneld" , year = 2010 } diff --git a/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.bib b/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.bib index a18b0cab0ae..1d4d0992338 100644 --- a/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.bib +++ b/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.bib @@ -6,7 +6,7 @@ % % automatically generated % % bibtex2html ../../../../Manual/doc_tex/Manual/manual-3.6.bib -% Date: Wed Jan 20 15:02:42 2010 +% Date: Fri Jan 22 17:29:36 2010 % Author: lrineau % @@ -52,8 +52,8 @@ TITLE = {Algebraic Kernel}, YEAR = {2010}, EDITION = {{3.6}}, - NOTE = {http\://www.cgal.org/Manual/3.6/doc\_html/cgal\_manual/packages.html\#Pkg\:AlgebraicFoundations}, - ALTNOTE = {\url{http://www.cgal.org/Manual/3.6/doc_html/cgal_manual/packages.html#Pkg:AlgebraicFoundations}}, + NOTE = {http\://www.cgal.org/Manual/3.6/doc\_html/cgal\_manual/packages.html\#Pkg\:AlgebraicKerneld}, + ALTNOTE = {\url{http://www.cgal.org/Manual/3.6/doc_html/cgal_manual/packages.html#Pkg:AlgebraicKerneld}}, } @INCOLLECTION{cgal:hhkps-nt-10, diff --git a/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.html b/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.html index 1659c0d0a02..256797864eb 100644 --- a/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.html +++ b/Manual_tools/src/latex_converter_config/html/Biblio/how_to_cite_cgal.html @@ -58,7 +58,7 @@ In CGAL User and Reference Manual. CGAL Editorial Board, 3.6 edition, 2010. -[WWW] +[WWW] [bibtex-key = cgal:bht-ak-10 - bibtex file]