hgbook
diff en/ch05-collab.xml @ 674:3b640272a966
Progres on resolve
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun Apr 12 00:05:30 2009 -0700 (2009-04-12) |
parents | b338f5490029 |
children | e6c99cbd0abd 83540574ee49 |
line diff
1.1 --- a/en/ch05-collab.xml Thu Apr 09 22:52:16 2009 -0700 1.2 +++ b/en/ch05-collab.xml Sun Apr 12 00:05:30 2009 -0700 1.3 @@ -23,7 +23,7 @@ 1.4 1.5 <para id="x_44d">Also for human consumption, the web interface provides an 1.6 RSS feed of the changes in a repository. This lets you 1.7 - <quote>subscribe</quote> to a repository using your favourite 1.8 + <quote>subscribe</quote> to a repository using your favorite 1.9 feed reader, and be automatically notified of activity in that 1.10 repository as soon as it happens. I find this capability much 1.11 more convenient than the model of subscribing to a mailing list 1.12 @@ -109,7 +109,7 @@ 1.13 <para id="x_456">As one example, many projects have a loose-knit group of 1.14 collaborators who rarely physically meet each other. Some 1.15 groups like to overcome the isolation of working at a distance 1.16 - by organising occasional <quote>sprints</quote>. In a sprint, 1.17 + by organizing occasional <quote>sprints</quote>. In a sprint, 1.18 a number of people get together in a single location (a 1.19 company's conference room, a hotel meeting room, that kind of 1.20 place) and spend several days more or less locked in there, 1.21 @@ -286,7 +286,7 @@ 1.22 <sect2> 1.23 <title>The release train</title> 1.24 1.25 - <para id="x_46c">Some projects are organised on a <quote>train</quote> 1.26 + <para id="x_46c">Some projects are organized on a <quote>train</quote> 1.27 basis: a release is scheduled to happen every few months, and 1.28 whatever features are ready when the <quote>train</quote> is 1.29 ready to leave are allowed in.</para>