--- a/tests/test-topic-mode.t	Sun Oct 01 11:13:38 2017 +0100
+++ b/tests/test-topic-mode.t	Sun Oct 01 11:18:36 2017 +0100
@@ -1,6 +1,6 @@
   $ . "$TESTDIR/testlib/topic_setup.sh"
 
-Testing the new config knob to forbid untopiced commit
+Testing the config knob to forbid untopiced commit
 ======================================================
 
   $ hg init $TESTTMP/untopic-commit
@@ -26,7 +26,7 @@
   abort: no active topic
   (see 'hg help -e topic.topic-mode' for details)
   [255]
-  $ hg ci -m "added a" --config experimental.topic-mode=off
+  $ hg ci -m "added a" --config experimental.topic-mode=ignore
   $ hg log
   changeset:   0:a154386e50d1
   tag:         tip
@@ -35,7 +35,7 @@
   summary:     added a
   
 
-Testing the new config knob to warn about untopiced commit
+Testing the config knob to warn about untopiced commit
 ==========================================================
 
   $ hg init $TESTTMP/untopic-warn-commit
@@ -59,7 +59,7 @@
   $ EDITOR=cat hg ci --amend -m "Added a" --edit
   warning: new draft commit without topic
   (see 'hg help -e topic.topic-mode' for details) (no-eol)
-  $ hg ci --amend -m "added a'" --config experimental.topic-mode=off
+  $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore
   $ hg log
   changeset:   2:2e862d8b5eff
   tag:         tip
@@ -69,7 +69,7 @@
   summary:     added a'
   
 
-Testing the new config knob to warn about untopiced merge commit
+Testing the config knob to warn about untopiced merge commit
 ================================================================
 
   $ hg init $TESTTMP/test-untopic-merge-commit
@@ -83,7 +83,7 @@
   > topic-mode = enforce
   > EOF
   $ touch ROOT
-  $ hg commit -A -m "ROOT" --config experimental.topic-mode=off
+  $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore
   adding ROOT
   $ touch a
   $ hg add a
@@ -96,7 +96,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch default
   $ hg add default
-  $ hg commit -m "default" --config experimental.topic-mode=off
+  $ hg commit -m "default" --config experimental.topic-mode=ignore
 
   $ hg merge mytopic
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -146,7 +146,7 @@
   > topic-mode = enforce-all
   > EOF
   $ touch ROOT
-  $ hg commit -A -m "ROOT" --config experimental.topic-mode=off
+  $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore
   adding ROOT
   $ touch a
   $ hg add a
@@ -159,7 +159,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch default
   $ hg add default
-  $ hg commit -m "default" --config experimental.topic-mode=off
+  $ hg commit -m "default" --config experimental.topic-mode=ignore
 
   $ hg merge mytopic
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -188,7 +188,7 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     ROOT
   
-Testing the new config knob to use a random topic for untopic commit
+Testing the config knob to use a random topic for untopic commit
 ====================================================================
 
   $ hg init $TESTTMP/test-untopic-random
@@ -203,7 +203,7 @@
   > EOF
 
   $ touch ROOT
-  $ hg commit -A -m "ROOT" --config experimental.topic-mode=off
+  $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore
   adding ROOT
 
   $ touch A
@@ -264,7 +264,7 @@
   > EOF
 
   $ touch ROOT
-  $ hg commit -A -m "ROOT" --config experimental.topic-mode=off
+  $ hg commit -A -m "ROOT" --config experimental.topic-mode=ignore
   adding ROOT
 
   $ touch A