[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon-tutorial/rev/d64ffbd7d8c6
changeset: 12:d64ffbd7d8c6
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Fri Oct 31 21:00:25 2008 +0000
description:
	Merge

diffstat:

3 files changed, 10 insertions(+), 7 deletions(-)
Doxyfile            |    2 +-
getting_started.dox |    9 ++++++---
install.dox         |    6 +++---

diffs (62 lines):

diff -r 55e2f7712e87 -r d64ffbd7d8c6 Doxyfile
--- a/Doxyfile	Thu Oct 30 17:13:33 2008 +0000
+++ b/Doxyfile	Fri Oct 31 21:00:25 2008 +0000
@@ -218,7 +218,7 @@
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = "./doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3" \
+TAGFILES               = "./libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3" \
                          "./lemon.tag = http://lemon.cs.elte.hu/pub/doc/1.0"
 GENERATE_TAGFILE       = 
 ALLEXTERNALS           = NO
diff -r 55e2f7712e87 -r d64ffbd7d8c6 getting_started.dox
--- a/getting_started.dox	Thu Oct 30 17:13:33 2008 +0000
+++ b/getting_started.dox	Fri Oct 31 21:00:25 2008 +0000
@@ -16,12 +16,14 @@
  *
  */
 
+namespace lemon {
 /**
 [PAGE]hello_lemon[PAGE] Compile Your First Code
 
-If you have installed LEMON on your system you can paste the following
-code segment into a file called <tt>hello_lemon.cc</tt> to have a first
-working program that uses LEMON.
+First of all you have to install LEMON on your system (see
+\ref install for instructions).
+After that you can paste the following code segment into a file
+<tt>hello_lemon.cc</tt> to have a first working program that uses LEMON.
 
 \dontinclude hello_lemon.cc
 \skip #include
@@ -116,3 +118,4 @@
 
 [TRAILER]
 */
+}
diff -r 55e2f7712e87 -r d64ffbd7d8c6 install.dox
--- a/install.dox	Thu Oct 30 17:13:33 2008 +0000
+++ b/install.dox	Fri Oct 31 21:00:25 2008 +0000
@@ -61,7 +61,7 @@
 (and Windows installers).
 If you want a developer version (for example you want to contribute in
 developing LEMON) then you might want to use our Mercurial repository.
-This case is detailed \ref hg_checkout "later", so from now on we
+This case is detailed \ref install_hg "later", so from now on we
 suppose that you downloaded a <tt>.tar.gz</tt> file.
 
 Thus you have to do the following steps.
@@ -215,9 +215,9 @@
 [SEC]compile_user_local[SEC] If LEMON is Installed User-Local
 
 You have to give more options to the compiler if LEMON is installed
-user-local into a directory (denoted by <tt><dir></tt>)
+user-local into a directory (denoted by <tt><dir></tt>)
 or if you just skipped the step <tt>make install</tt>.
-In the later case <tt><dir></tt> denotes the directory in which the
+In the later case <tt><dir></tt> denotes the directory in which the
 the \c make command have been performed.
 
 \verbatim