diff ja/collab.tex @ 802:de4142983445

Propagate 3b640272a966 Progres on resolve

--- a/ja/collab.tex	Thu Jun 18 20:12:07 2009 +0900
+++ b/ja/collab.tex	Sun Jun 21 09:20:47 2009 +0900
@@ -34,7 +34,7 @@
 
 %Also for human consumption, the web interface provides an RSS feed of
 %the changes in a repository.  This lets you ``subscribe'' to a
-%repository using your favourite feed reader, and be automatically
+%repository using your favorite feed reader, and be automatically
 %notified of activity in that repository as soon as it happens.  I find
 %this capability much more convenient than the model of subscribing to
 %a mailing list to which notifications are sent, as it requires no
@@ -161,7 +161,7 @@
 
 %As one example, many projects have a loose-knit group of collaborators
 %who rarely physically meet each other.  Some groups like to overcome
-%the isolation of working at a distance by organising occasional
+%the isolation of working at a distance by organizing occasional
 %``sprints''.  In a sprint, a number of people get together in a single
 %location (a company's conference room, a hotel meeting room, that kind
 %of place) and spend several days more or less locked in there, hacking
@@ -407,7 +407,7 @@
 %\subsection{The release train}
 \subsection{$B%j%j!<%9%H%l%$%s(B}
 
-%Some projects are organised on a ``train'' basis: a release is
+%Some projects are organized on a ``train'' basis: a release is
 %scheduled to happen every few months, and whatever features are ready
 %when the ``train'' is ready to leave are allowed in.