diff -r acc2b590edd9 -r a585353a816b tests/test-exchange-A1.t
--- a/tests/test-exchange-A1.t	Fri Aug 08 15:50:26 2014 -0700
+++ b/tests/test-exchange-A1.t	Fri Aug 08 23:14:00 2014 -0700
@@ -54,8 +54,8 @@
   $ cp -r A.1.1 A.1.1.b
 
 
-Variante a: push -r A
----------------------
+Variant a: push -r A
+--------------------
 
   $ dotest A.1.1.a A
   ## Running testcase A.1.1.a
@@ -74,7 +74,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -91,7 +91,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -105,8 +105,8 @@
 
 
 
-Variante b: push
----------------------
+Variant b: push
+---------------
 
   $ dotest A.1.1.b
   ## Running testcase A.1.1.b
@@ -124,7 +124,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -141,7 +141,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -213,8 +213,8 @@
   $ cp -r A.1.2 A.1.2.b
 
 
-Variante a: push -r A
----------------------
+Variant a: push -r A
+--------------------
 
   $ dotest A.1.2.a B
   ## Running testcase A.1.2.a
@@ -233,7 +233,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -250,7 +250,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state
@@ -261,8 +261,8 @@
   # obstore: pulldest
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
 
-Variante b: push
----------------------
+Variant b: push
+---------------
 
   $ dotest A.1.2.b
   ## Running testcase A.1.2.b
@@ -280,7 +280,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers (62 bytes)
+  OBSEXC: pushing 1 obsolescence markers (62 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -297,7 +297,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: pull obsolescence markers
   OBSEXC: merging obsolescence markers (62 bytes)
-  OBSEXC: 1 markers added
+  OBSEXC: 1 obsolescence markers added
   OBSEXC: DONE
   (run 'hg update' to get a working copy)
   ## post pull state