Rev 6016: (mbp) improved tutorial text; mention codename for release (Martin Pool) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6016 [merge]
revision-id: pqm at pqm.ubuntu.com-20110708235815-518j7ziokxp4vbr1
parent: pqm at pqm.ubuntu.com-20110707154803-vr68i08940zpfumi
parent: mbp at canonical.com-20110701220147-sac0orp118t1fd2x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-07-08 23:58:15 +0000
message:
  (mbp) improved tutorial text; mention codename for release (Martin Pool)
modified:
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/whats-new/whats-new-in-2.4.txt whatsnewin2.4.txt-20110114044330-nipk1og7j729fy89-1
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt	2011-06-28 16:03:09 +0000
+++ b/doc/en/mini-tutorial/index.txt	2011-07-01 22:01:47 +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'
--- a/doc/en/whats-new/whats-new-in-2.4.txt	2011-06-22 16:04:52 +0000
+++ b/doc/en/whats-new/whats-new-in-2.4.txt	2011-07-01 12:10:23 +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