# HG changeset patch
# User Aurélien Campéas
# Date 1504101424 -7200
# Node ID e61a9fde2125240d4338363a3500b1e081751744
# Parent  5a836fa589a4557e932af9c6427e7603ae789b6b
topic: tutorial grammar fixes

diff -r 5a836fa589a4 -r e61a9fde2125 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Wed Aug 30 11:36:47 2017 +0200
+++ b/tests/test-topic-tutorial.t	Wed Aug 30 15:57:04 2017 +0200
@@ -47,7 +47,7 @@
   > EOF
 
 Topic branches are lightweight branches which disappear when changes are
-finalized (move to the public phase). They can help users to organize and share
+finalized (moved to the public phase). They can help users to organize and share
 their unfinished work.
 
 Topic Basics
@@ -63,13 +63,13 @@
      summary:     Shopping list
   
 
-We are about to make some additions to this list and would like to do them 
+We are about to make some additions to this list and would like to do them
 within a topic. Creating a new topic is done using the ``topic`` command:
 
   $ hg topic food
 
 Much like a named branch, our topic is active but it does not contain any
-changesets yet:
+changeset yet:
 
   $ hg topic
    * food
@@ -350,7 +350,7 @@
 Working with Multiple Topics
 ============================
 
-In the above example, topics do not bring much benefit since you only have one
+In the above example, topics do not bring much benefits since you only have one
 line of development. Topics start to be more useful when you have to work on
 multiple features at the same time.
 
@@ -589,7 +589,7 @@
 Navigating within your stack
 ----------------------------
 
-As we saw before `stack` display changesets on your current topic in a clean way:
+As we saw before `stack` displays changesets on your current topic in a clean way:
 
   $ hg topics --verbose
    * tools (on branch: default, 3 changesets, 2 behind)
@@ -709,7 +709,7 @@
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a pair of shoes
   
-Fortunately stack show you a better visualization:
+Fortunately stack shows you a better visualization:
 
   $ hg stack
   ### topic: tools
@@ -812,7 +812,7 @@
   t1: Adding hammer to the shopping list
   t0^ add a pair of shoes (base)
 
-Solving this situation is easy with a topic, use merge or rebase.
+Solving this situation is easy with a topic: use merge or rebase.
 Merge within a multi-headed stack will use the other topic head as
 redestination if the topic has multiple heads.
 
@@ -910,8 +910,8 @@
   t1: Adding hammer to the shopping list
   t0^ add a pair of shoes (base)
 
-Collaborating through non-publishing server
-===========================================
+Collaborating through a non-publishing server
+========================--===================
 
 .. setup:
 
@@ -939,7 +939,7 @@
 
   $ cd client
 
-We can now share theses drafts changesets:
+We can now share these draft changesets:
 
   $ hg push ../non-publishing-server -r tools
   pushing to ../non-publishing-server
@@ -950,11 +950,11 @@
   added 4 changesets with 4 changes to 1 files (+1 heads)
   8 new obsolescence markers
 
-Pushing the new topic branch to a non publishing server did not required
+Pushing the new topic branch to a non publishing server did not require
 --force. As long as new heads are on their own topic, Mercurial will not
-complains about them.
+complain about them.
 
-From another client, we will gets them with their topic:
+From another client, we will get them with their topic:
 
   $ cd ../other-client