Merge lp:~mbp/bzr/doc into lp:bzr

[Martin Pool]

improved tutorial text; mention codename for release

Just mention the release codename in the whatsnew doc.

[John A Meinel (jameinel)]

I don't really know what Oronsay is but
Merge: approve

=:->
On Jul 1, 2011 1:15 PM, "Martin Pool" <email address hidden> wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #398653 in Bazaar: "Releasing guide should include instructions on
updating trunk NEWS file"
> https://bugs.launchpad.net/bzr/+bug/398653
> Bug #473099 in Bazaar: "Incorrect markup in centralized workflow tutorial"
> https://bugs.launchpad.net/bzr/+bug/473099
> Bug #512385 in Bazaar: "Broken link to "quick start card" in online user
guide"
> https://bugs.launchpad.net/bzr/+bug/512385
> Bug #599187 in Bazaar: "selective commit not failing as documented"
> https://bugs.launchpad.net/bzr/+bug/599187
> Bug #664898 in Bazaar: "latex release notes fails with unicode error"
> https://bugs.launchpad.net/bzr/+bug/664898
> Bug #746237 in Bazaar: "Documentation markup bugs"
> https://bugs.launchpad.net/bzr/+bug/746237
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/doc/+merge/66592
>
> Just mention the release codename in the whatsnew doc.
> --
> https://code.launchpad.net/~mbp/bzr/doc/+merge/66592
> Your team Bazaar Codereview Subscribers is subscribed to branch lp:bzr.

[Martin Pool (mbp)]

It's the name of several Scottish Islands: it gives us an O-series name and it marks our Caledonian visitor.

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'doc/en/mini-tutorial/index.txt'
--- doc/en/mini-tutorial/index.txt	2011-06-28 16:03:09 +0000
+++ doc/en/mini-tutorial/index.txt	2011-07-01 22:03:32 +0000
@@ -56,8 +56,12 @@
 
 Let's suppose we want to store a new project under Bazaar.  First, we'll
 make a *repository directory* to hold all our work related to this
-project.  We can then have multiple branch directories under here, and
-they'll all store the committed history in the repository.
+project, where developers can create branches to test development of
+specific features or, more generally, modifications to the working file
+set.  
+
+After creating the repository, change to that directory, and create the
+project's main trunk branch.
 
 ::
 
@@ -67,9 +71,26 @@
   cd trunk
 
 
+Adding files
+============
+
+Now that we have the trunk, we need to move to that directory and
+create some example files for the first version of that project.  Create
+a file ``test1.txt`` using a text editor (like emacs, nano, or notepad),
+and save it.  Then we'll "add" the file, which tells bzr we want it to
+track changes::
+
+  bzr add test1.txt
+
+and then commit, which saves a snapshot of all versioned files::
+
+  bzr commit -m "Added first line of text"
+
+
 Making changes to your files
 ============================
 
+
 Let's change a file and commit that change to your branch.
 
 Edit ``test1.txt`` in your favourite editor, then check what have you done::

=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
--- doc/en/whats-new/whats-new-in-2.4.txt	2011-06-22 16:04:52 +0000
+++ doc/en/whats-new/whats-new-in-2.4.txt	2011-07-01 22:03:32 +0000
@@ -1,6 +1,6 @@
-*************************
-What's New in Bazaar 2.4?
-*************************
+***********************************
+What's New in Bazaar 2.4 (Oronsay)?
+***********************************
 
 Bazaar 2.4 is still under development, and will be released in August 2011.
 This document accumulates a high level summary of what's changed.  See the