--- a/docs/index.rst	Wed Aug 30 11:25:51 2017 +0200
+++ b/docs/index.rst	Wed Aug 30 11:26:00 2017 +0200
@@ -134,24 +134,25 @@
 Whenever we are happy with a direction experimented in the extension, the
 relevant code go upstream.
 
-``evolve`` is experimental!
----------------------------
+Development status
+------------------
 
-The long-term plan for ``evolve`` is to add it to core Mercurial.
-However, it is not yet stable enough for that. In particular:
+While well on the way, the full implementation of the changeset evolution
+concept is still in progress. Core Mercurial already supports many of the
+associated features, but for now they are still disabled by default. The current
+implementation has been usable for multiple years already, and some parts of it
+are used in production in multiple projects and companies (including the
+Mercurial project itself, Facebook, Google, etc…).
 
-  * The UI is unstable: ``evolve``'s command names and command options
-    are not completely nailed down yet. They are subject to occasional
-    backwards-incompatible changes. If you write scripts that use
-    evolve commands, a future release could break your scripts.
+However, there are still some areas were the current implementation has gaps.
+This means some use cases or performance issues are not handled as well as they
+currently are without evolution. Mercurial has been around for a long time and
+is strongly committed to backward compatibility, and turning evolution on by
+default nowadays could regress the experience of some of our current users. The
+feature will be enabled by default at the point where users who do not use or
+care about the new features added by evolution won't be impacted by it. 
 
-  * There are still some corner cases that aren't handled yet. If you
-    think you have found such a case, please check if it's already
-    described in the Mercurial bug tracker (https://bz.mercurial-scm.org/).
-    Bugs in ``evolve`` are files under component "evolution": use
-    `this query`_ to view open bugs in ``evolve``.
-
-.. _`this query`: https://bz.mercurial-scm.org/buglist.cgi?component=evolution&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEED_EXAMPLE
+.. # .. _`this query`: https://bz.mercurial-scm.org/buglist.cgi?component=evolution&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEED_EXAMPLE
 
 Ressources
 ----------