Merge branch 'master' of github.com:simgrid/simgrid

diff --git a/NEWS b/NEWS
index acbd344..22b9e00 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ __   _____ _ __ ___(_) ___  _ __   |___ / / |( _ )
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_|\___/
                (not released yet)
 
+The "Oh Oh Oh! SimGrid 4 is approaching" release.
+
+ * New model: energy consumption due to the network.
+ * Major cleanups in the disk and storage subsystems.
+ * Convert most of MSG examples to S4U.
+ * (+ further deprecate XBT, bug fixes and doc improvement)
                     _               _____  _ _____
 __   _____ _ __ ___(_) ___  _ __   |___ / / |___  |
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ | |  / /

diff --git a/examples/s4u/trace-platform/s4u-trace-platform.cpp b/examples/s4u/trace-platform/s4u-trace-platform.cpp
index b448b0e..7cea650 100644 (file)
--- a/examples/s4u/trace-platform/s4u-trace-platform.cpp
+++ b/examples/s4u/trace-platform/s4u-trace-platform.cpp
@@ -1,8 +1,13 @@
-/* Copyright (c) 2010, 2012-2016. The SimGrid Team. All rights reserved.    */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/* This source code simply loads the platform. This is only useful to play
+ * with the tracing module. See the tesh file to see how to generate the
+ * traces.
+ */
+
 #include "simgrid/s4u.hpp"
 
 int main(int argc, char* argv[])