From 51c4616b5fb2a3f8b7759883989152a8e7a7df15 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 26 Jun 2023 11:43:41 +0200
Subject: [PATCH 1/1] Improve the documentation of this release, and introduce
 a release nick

---
 ChangeLog | 14 +++++++++-----
 NEWS      | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cea06b8307..f790d041a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-SimGrid (3.32.1) not released yet (target december 22)
+SimGrid (3.33.1) not released yet (target december 22)
+
+  Save the planet, skip a release: 3.33 was due 6 months ago, so skip directly to 3.34.
 
 General:
  - SimGrid now requires a compiler with C++17 support for public headers too.
@@ -75,13 +77,15 @@ sthread:
    It requires code annotation, as shown in examples/sthread/stdobject/stdobject.cpp
 
 Model checking:
+ - Stateless model-checking is now usable on any system, including Mac OSX and ARM processors.
+ - The stateless aspects of the MC are now enabled by default in all SimGrid builds.
+   Liveness and stateful aspects are still controled by the enabling_model-checking
+   configuration option.
+ - Introducing ODPOR and SDPOR reduction strategies
+ - Introducing guiding heuristics, trying to find bugs faster than DFS in reduced state space.
  - Synchronize the MBI tests with upstream.
  - Show the full actor bactraces when replaying a MC trace (with model-check/replay)
    and the status of all actors on deadlocks in MC mode.
- - The safety/stateless aspects of the MC are now enabled by default in all SimGrid builds.
-   Liveness and stateful aspects are still controled by the enabling_model-checking
-   configuration option.
- - Stateless model-checking is now usable on any system, including Mac OSX and ARM processors.
 
 XBT:
  - simgrid::xbt::cmdline and simgrid::xbt::binary_name are gone.
diff --git a/NEWS b/NEWS
index fe01ae8b50..f0f36fd15b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,20 @@
-                    _               _____  __________
-__   _____ _ __ ___(_) ___  _ __   |___ / |___ /___ /
-\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \ |_ \
- \ V /  __/ |  \__ \ | (_) | | | |  ___) | ___) |__) |
-  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/____/
+                    _               _____  _____ _  _
+__   _____ _ __ ___(_) ___  _ __   |___ / |___ /| || |
+\ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \| || |_
+ \ V /  __/ |  \__ \ | (_) | | | |  ___) | ___) |__   _|
+  \_/ \___|_|  |___/_|\___/|_| |_| |____(_)____/   |_|
                (not released yet)
 
-  * MSG and Java are gone (EOL was scheduled for 2020)
+Save the planet, skip a release: 3.33 was due 6 months ago, so skip directly to 3.34.
+
+  * MSG and Java are gone (EOL was scheduled for 2020), move to C++17 and drop 32bits support.
   * Introduce a fluid I/O model, mixing I/O and network, to represent streaming from disk
-  * Fix the DPOR reduction, toward sound verifications.
+  * DAG/workflow loader; Introducing Tasks which are activities that can be fired several times.
+  * Several new documentation sections, and a new tutorial.
+  * Safety properties now portable to every OS, activated by default in all builds.
+  * Introduction ODPOR/SDPOR reductions and guiding strategies (better state space traversal).
   * (+ MANY internal refactoring, bug fixes and MANY documentation improvement)
+
                     _               _____  _________
 __   _____ _ __ ___(_) ___  _ __   |___ / |___ /___ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \   |_ \ __) |
-- 
2.20.1