Merge #342
authorAlpar Juttner <alpar@cs.elte.hu>
Sun, 28 Feb 2010 20:52:08 +0100 (2010-02-28)
changeset 8491b8db382910c
parent 847 754272f20318
parent 848 e05b2b48515a
child 850 e77b621e6e7e
Merge #342
     1.1 --- a/README	Sun Feb 28 19:58:24 2010 +0100
     1.2 +++ b/README	Sun Feb 28 20:52:08 2010 +0100
     1.3 @@ -17,6 +17,10 @@
     1.4  
     1.5     Copying, distribution and modification conditions and terms.
     1.6  
     1.7 +NEWS
     1.8 +
     1.9 +   News and version history.
    1.10 +
    1.11  INSTALL
    1.12  
    1.13     General building and installation instructions.
    1.14 @@ -33,6 +37,10 @@
    1.15  
    1.16     Some example programs to make you easier to get familiar with LEMON.
    1.17  
    1.18 +scripts/
    1.19 +
    1.20 +   Scripts that make it easier to develop LEMON.
    1.21 +
    1.22  test/
    1.23  
    1.24     Programs to check the integrity and correctness of LEMON.
     2.1 --- a/doc/mainpage.dox	Sun Feb 28 19:58:24 2010 +0100
     2.2 +++ b/doc/mainpage.dox	Sun Feb 28 20:52:08 2010 +0100
     2.3 @@ -23,9 +23,9 @@
     2.4  
     2.5  <b>LEMON</b> stands for <i><b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
     2.6  and <b>O</b>ptimization in <b>N</b>etworks</i>.
     2.7 -It is a C++ template library providing efficient implementation of common
     2.8 +It is a C++ template library providing efficient implementations of common
     2.9  data structures and algorithms with focus on combinatorial optimization
    2.10 -problems in graphs and networks.
    2.11 +tasks connected mainly with graphs and networks. 
    2.12  
    2.13  <b>
    2.14  LEMON is an <a class="el" href="http://opensource.org/">open&nbsp;source</a>
    2.15 @@ -39,8 +39,8 @@
    2.16  <a href="http://www.cs.elte.hu/egres/">Egerv&aacute;ry Research Group on
    2.17  Combinatorial Optimization</a> \ref egres
    2.18  at the Operations Research Department of the
    2.19 -<a href="http://www.elte.hu/">E&ouml;tv&ouml;s Lor&aacute;nd University,
    2.20 -Budapest</a>, Hungary.
    2.21 +<a href="http://www.elte.hu/en/">E&ouml;tv&ouml;s Lor&aacute;nd University</a>,
    2.22 +Budapest, Hungary.
    2.23  LEMON is also a member of the <a href="http://www.coin-or.org/">COIN-OR</a>
    2.24  initiative \ref coinor.
    2.25  
    2.26 @@ -49,6 +49,10 @@
    2.27  If you would like to get to know the library, see
    2.28  <a class="el" href="http://lemon.cs.elte.hu/pub/tutorial/">LEMON Tutorial</a>.
    2.29  
    2.30 +If you are interested in starting to use the library, see the <a class="el"
    2.31 +href="http://lemon.cs.elte.hu/trac/lemon/wiki/InstallGuide/">Installation
    2.32 +Guide</a>.
    2.33 +
    2.34  If you know what you are looking for, then try to find it under the
    2.35  <a class="el" href="modules.html">Modules</a> section.
    2.36