From: lilia <lilia@amazigh.bordeaux.inria.fr>
Date: Mon, 28 Apr 2014 15:23:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/hpcc2014
X-Git-Tag: hpcc2014_submission~20
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/commitdiff_plain/4661ca86a496894458d1605072a1624593e70ab5?hp=eee2ce96cdbc6990b0a059a92129c0f547a3dad2

Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/hpcc2014
---

diff --git a/hpcc.tex b/hpcc.tex
index 37ad4e3..66dbbfc 100644
--- a/hpcc.tex
+++ b/hpcc.tex
@@ -251,8 +251,8 @@ SimGrid~\cite{SimGrid,casanova+legrand+quinson.2008.simgrid} is a simulation
 framework to study the behavior of large-scale distributed systems.  As its name
 says, it emanates from the grid computing community, but is nowadays used to
 study grids, clouds, HPC or peer-to-peer systems.  The early versions of SimGrid
-date from 1999, but it's still actively developed and distributed as an open
-source software.  Today, it's one of the major generic tools in the field of
+date from 1999, but it is still actively developed and distributed as an open
+source software.  Today, it is one of the major generic tools in the field of
 simulation for large-scale distributed systems.
 
 SimGrid provides several programming interfaces: MSG to simulate Concurrent