[Lemon-commits] [Lemon-1.0 commits] Alpar Juttner: Merge from trunk

Lemon HG hg at lemon.cs.elte.hu
Fri Oct 10 12:02:05 CEST 2008


details:   http://lemon.cs.elte.hu/hg/lemon-1.0/rev/d3a7603026a2
changeset: 326:d3a7603026a2
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Oct 10 10:52:08 2008 +0100
description:
	Merge from trunk

diffstat:

4 files changed, 25 insertions(+), 35 deletions(-)
INSTALL        |   22 +++++++---------------
README         |    2 +-
doc/dirs.dox   |   30 ++++++++++++++----------------
doc/groups.dox |    6 +++---

diffs (171 lines):

diff -r 2592532ee838 -r d3a7603026a2 INSTALL
--- a/INSTALL	Thu Oct 09 21:06:43 2008 +0200
+++ b/INSTALL	Fri Oct 10 10:52:08 2008 +0100
@@ -1,11 +1,11 @@
 Installation Instructions
 =========================
 
-   Since you are reading this I assume you already obtained one of the release
+Since you are reading this I assume you already obtained one of the release
 tarballs and successfully extracted it. The latest version of LEMON is
 available at our web page (http://lemon.cs.elte.hu/).
 
-   In order to install LEMON from the extracted source tarball you have to
+In order to install LEMON from the extracted source tarball you have to
 issue the following commands:
 
    1. `cd lemon-x.y.z'
@@ -21,8 +21,8 @@
    3. `make'
 
       This command compiles the non-template part of LEMON into libemon.a
-      file. It also compiles the programs in the tools, benchmark and demo
-      subdirectories when enabled.
+      file. It also compiles the programs in the tools and demo subdirectories
+      when enabled.
 
    4. `make check'
 
@@ -49,12 +49,12 @@
 Configure Options and Variables
 ===============================
 
-   In step 2 you can customize the actions of configure by setting variables
+In step 2 you can customize the actions of configure by setting variables
 and passing options to it. This can be done like this:
 `./configure [OPTION]... [VARIABLE=VALUE]...'
 
-   Below you will find some useful variables and options (see
-`./configure --help' for more):
+Below you will find some useful variables and options (see `./configure --help'
+for more):
 
 CXX='comp'
 
@@ -76,14 +76,6 @@
 --disable-demo
 
    Do not build the examples in the demo subdirectory (default).
-
---enable-benchmark
-
-   Build the programs in the benchmark subdirectory.
-
---disable-benchmark
-
-   Do not build the programs in the benchmark subdirectory (default).
 
 --enable-tools
 
diff -r 2592532ee838 -r d3a7603026a2 README
--- a/README	Thu Oct 09 21:06:43 2008 +0200
+++ b/README	Fri Oct 10 10:52:08 2008 +0100
@@ -35,7 +35,7 @@
 
 test/
 
-   Contains programs to check the integrity and correctness of LEMON.
+   Programs to check the integrity and correctness of LEMON.
 
 tools/
 
diff -r 2592532ee838 -r d3a7603026a2 doc/dirs.dox
--- a/doc/dirs.dox	Thu Oct 09 21:06:43 2008 +0200
+++ b/doc/dirs.dox	Fri Oct 10 10:52:08 2008 +0100
@@ -18,9 +18,9 @@
 
 /**
 \dir demo
-\brief A collection of demo application.
+\brief A collection of demo applications.
 
-This directory contains several simple demo application, mainly
+This directory contains several simple demo applications, mainly
 for educational purposes.
 */
 
@@ -28,7 +28,8 @@
 \dir doc
 \brief Auxiliary (and the whole generated) documentation.
 
-Auxiliary (and the whole generated) documentation.
+This directory contains some auxiliary pages and the whole generated
+documentation.
 */
 
 /**
@@ -41,19 +42,16 @@
 
 /**
 \dir tools
-\brief Some useful executables
+\brief Some useful executables.
 
 This directory contains the sources of some useful complete executables.
-
 */
-
-
 
 /**
 \dir lemon
-\brief Base include directory of LEMON
+\brief Base include directory of LEMON.
 
-This is the base directory of lemon includes, so each include file must be
+This is the base directory of LEMON includes, so each include file must be
 prefixed with this, e.g.
 \code
 #include<lemon/list_graph.h>
@@ -63,17 +61,17 @@
 
 /**
 \dir concepts
-\brief Concept descriptors and checking classes
+\brief Concept descriptors and checking classes.
 
-This directory contains the concept descriptors and concept checkers. As a user
-you typically don't have to deal with these files.
+This directory contains the concept descriptors and concept checking tools.
+For more information see the \ref concept "Concepts" module.
 */
 
 /**
 \dir bits
-\brief Implementation helper files
+\brief Auxiliary tools for implementation.
 
-This directory contains some helper classes to implement graphs, maps and
-some other classes. As a user you typically don't have to deal with these
-files.
+This directory contains some auxiliary classes for implementing graphs, 
+maps and some other classes.
+As a user you typically don't have to deal with these files.
 */
diff -r 2592532ee838 -r d3a7603026a2 doc/groups.dox
--- a/doc/groups.dox	Thu Oct 09 21:06:43 2008 +0200
+++ b/doc/groups.dox	Fri Oct 10 10:52:08 2008 +0100
@@ -135,7 +135,7 @@
 /**
 @defgroup paths Path Structures
 @ingroup datas
-\brief Path structures implemented in LEMON.
+\brief %Path structures implemented in LEMON.
 
 This group describes the path structures implemented in LEMON.
 
@@ -270,12 +270,12 @@
 
 The purpose of the classes in this group is fourfold.
 
-- These classes contain the documentations of the concepts. In order
+- These classes contain the documentations of the %concepts. In order
   to avoid document multiplications, an implementation of a concept
   simply refers to the corresponding concept class.
 
 - These classes declare every functions, <tt>typedef</tt>s etc. an
-  implementation of the concepts should provide, however completely
+  implementation of the %concepts should provide, however completely
   without implementations and real data structures behind the
   interface. On the other hand they should provide nothing else. All
   the algorithms working on a data structure meeting a certain concept



More information about the Lemon-commits mailing list