Getting Started with Bazaar presentation updated (and ready forthe masses)

[John Yates]

Aaron Bentley wrote:

> Yeah, I'd be happy with some friendier term for "merge directive".

There really are only two meaningful ways for upstream to incorporate work:

1) apply a patch
2) perform a merge

When talking email a newbie most likely imagines a patch-based model.

The presence of the word _merge_ underscores the semantic difference in what bzr can accomplish.  I think that it is the imperative connotation -- "Do this!" -- of the term _directive_ that this a bit off-putting.  The recipient of an MD actually has full leave to merge or not has she chooses.

So maybe something like "merge packet" might be more palatable.

/john