From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Wed, 14 Nov 2012 22:02:08 +0000 (+0100)
Subject: Git-reset should do the job here, plus minor corrections.
X-Git-Tag: v3_9_rc1~91^2~98
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/74299bd06aa732e550c2693926bb0c4c8b4143aa?ds=sidebyside

Git-reset should do the job here, plus minor corrections.
---

diff --git a/doc/dev_guide/doxygen/release.doc b/doc/dev_guide/doxygen/release.doc
index a1027dfea4..280d1571cd 100644
--- a/doc/dev_guide/doxygen/release.doc
+++ b/doc/dev_guide/doxygen/release.doc
@@ -15,10 +15,10 @@ Please apply the following checklist before releasing.
   - The" make distcheck" target works (testing that every files needed
     to build and install are included in the archive)
 - Tests
-  - All tests pass on a reasonnable amount of platforms (typically,
+  - All tests pass on a reasonable amount of platforms (typically,
     everything on cdash)
   - You also tested to build and install the content of the source
-    archive on a reasonnable amount of platforms (typically, 2 or 3).
+    archive on a reasonable amount of platforms (typically, 2 or 3).
 - ChangeLog file
   - Every changes are documented
   - The release date is indicated below the changes
@@ -36,8 +36,7 @@ globbing, you must ensure that your tree contains no cruft. You can
 either checkout a new tree or remove anything from your current tree:
 \verbatim
 $ cd simgrid
-$ git stash
-$ git stash clear
+$ git reset --hard master
 $ git clean -dfx
 \endverbatim
 
@@ -77,7 +76,7 @@ $ make nsis
 - Announce the release
  - Mail the simgrid-user mailing list
     - the NEWS chunk in the mail;
-    - the ChangeLog chunk as attachement
+    - the ChangeLog chunk as attachment
  - Also mail some other lists (G5K users), with only the NEWS chunk
    and the link to the download section