Merge pull request #1459 from sivaraam/pu-to-seen-change

Author: ben

book/05-distributed-git/sections/maintaining.asc

@@ -343,7 +343,7 @@ Then, when the codebase on that branch is stable and passes tests, you merge it
 ===== Large-Merging Workflows
 
 (((workflows, "merging (large)")))
-The Git project has four long-running branches: `master`, `next`, and `pu` (proposed updates) for new work, and `maint` for maintenance backports.
+The Git project has four long-running branches: `master`, `next`, and `seen` (formerly 'pu' -- proposed updates) for new work, and `maint` for maintenance backports.
 When new work is introduced by contributors, it's collected into topic branches in the maintainer's repository in a manner similar to what we've described (see <<merwf_f>>).
 At this point, the topics are evaluated to determine whether they're safe and ready for consumption or whether they need more work.
 If they're safe, they're merged into `next`, and that branch is pushed up so everyone can try the topics integrated together.
@@ -352,10 +352,10 @@ If they're safe, they're merged into `next`, and that branch is pushed up so eve
 .Managing a complex series of parallel contributed topic branches
 image::images/large-merges-1.png[Managing a complex series of parallel contributed topic branches]
 
-If the topics still need work, they're merged into `pu` instead.
+If the topics still need work, they're merged into `seen` instead.
 When it's determined that they're totally stable, the topics are re-merged into `master`.
-The `next` and `pu` branches are then rebuilt from the `master`.
-This means `master` almost always moves forward, `next` is rebased occasionally, and `pu` is rebased even more often:
+The `next` and `seen` branches are then rebuilt from the `master`.
+This means `master` almost always moves forward, `next` is rebased occasionally, and `seen` is rebased even more often:
 
 .Merging contributed topic branches into long-term integration branches
 image::images/large-merges-2.png[Merging contributed topic branches into long-term integration branches]