From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Sat, 27 Oct 2012 14:20:36 +0000 (+0200)
Subject: Merge branch 'v3_8_x'
X-Git-Tag: v3_9_rc1~91^2~191
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fc3419efe4d92bfa202543376995977c6a3171e9?hp=ebf1dd817fe3f1e1079702e7ab846b7fe7640432

Merge branch 'v3_8_x'

Conflicts:
	ChangeLog (fixed).
---

diff --git a/ChangeLog b/ChangeLog
index 057bbc2c6d..f458630970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,11 +6,11 @@ SimGrid (3.9) NOT RELEASED; urgency=low
 
  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
-SimGrid (3.8.1) NOT RELEASED; urgency=low
+SimGrid (3.8.1) stable; urgency=low
 
- (to complete)
+ * Add missing file "tesh.1" to the archive.
 
- -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Sat Oct 27 16:12:11 CEST 2012 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.8) stable; urgency=low
 
diff --git a/NEWS b/NEWS
index 3002f058d6..3353af294e 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,12 @@ __   _____ _ __ ___(_) ___  _ __   |___ / ( _ ) / |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ / _ \ | |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) | (_) || |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)___(_)_|
+                Oct 27 2012
 
-(to complete)
+The "we are told that some people want to also *install* the simgrid
+framework" release.
+
+ * Add missing manpage to the archive.
                     _               _____  ___
 __   _____ _ __ ___(_) ___  _ __   |___ / ( _ )
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ / _ \
diff --git a/tools/tesh/tesh.1 b/tools/tesh/tesh.1
index 35a02caf50..38c1d4e8cd 100644
--- a/tools/tesh/tesh.1
+++ b/tools/tesh/tesh.1
@@ -3,7 +3,7 @@
 .SH NAME
 tesh \- testing shell
 .SH SYNOPSIS
-.B ls
+.B tesh
 [\fIOPTION\fR]... [\fIFILE\fR]...
 .SH DESCRIPTION
 This is the TESH tool. It constitutes a testing shell, ie a sort of shell specialized to run tests. The list of actions to take is parsed from files files called testsuite. 
@@ -63,7 +63,7 @@ implemented yet in tesh. This is a bit restrictive, but well, patch
 welcome...
 
 The situation in which it is mainly problematic is to create a
-temporary file. The solution is to use the "mkfile" buildin command,
+temporary file. The solution is to use the "mkfile" built-in command,
 as in the following example:
 $ mkfile myFile
 > some content
@@ -104,7 +104,7 @@ SimGrid since the processes run out of order at any scheduling point
 parallel). To ensure that the simulator outputs still match, we have
 to sort the output back before comparing it. 
 
-We expect the simulators to run with that log formating argument:
+We expect the simulators to run with that log formatting argument:
    -log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
 Then, tesh sorts string on the 19 first chars only, and is stable when
 line beginnings are equal. This should ensure that: