From 3c38e443b3e155992ed1921e9bc6587a09f59c2b Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 24 Feb 2009 08:08:40 +0000 Subject: [PATCH] Minor typos. --- pep-0374.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0374.txt b/pep-0374.txt index 612595e0f..3153547e1 100644 --- a/pep-0374.txt +++ b/pep-0374.txt @@ -999,7 +999,7 @@ greatly simplify working on dependent branches because they automatically take care of the stacking dependencies for you. Imagine looms as a stack of dependent branches (called "threads" in loom parlance), with easy ways to move up and down the stack of -thread, merge changes up the stack to descendant threads, create +threads, merge changes up the stack to descendant threads, create diffs between threads, etc. Occasionally, you may need or want to export your loom threads into separate branches, either for review or commit. Higher threads incorporate all the changes in the lower @@ -1032,7 +1032,7 @@ now-redundant fix-socket thread. bzr down-thread trunk # Get all new revisions to the trunk. If you've done things - # correctly, this must succeed without conflict. + # correctly, this will succeed without conflict. bzr pull bzr up-thread # See? The fix-socket thread is now identical to the trunk