[MERGE] Tutorial updates
Matthew D. Fuller
fullermd at over-yonder.net
Wed Jun 6 11:00:26 BST 2007
On Wed, May 30, 2007 at 12:59:47PM -0500 I heard the voice of
Matthew D. Fuller, and lo! it spake thus:
>
> I'll put it on my todo to run through and smash them over to ``.
I've done this, and fixed up a few other things that I came across in
the process.
- $BZREMAIL -> $BZR_EMAIL
- Clean up some formatting so it outputs right.
Note that there are some places I've left command _names_ in *'s. My
theory is that in those places, they're describing more the concept
than the command, and the bold gives a good eyecatch on skimming.
Bundle attached.
--
Matthew Fuller (MF4839) | fullermd at over-yonder.net
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar revision bundle v0.9
#
# message:
# Be more consistent about using `` around options and filenames.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Wed 2007-06-06 04:52:55.796999931 -0500
=== modified file doc/tutorial.txt
--- doc/tutorial.txt
+++ doc/tutorial.txt
@@ -129,21 +129,24 @@
% bzr whoami --branch "Your Name <email at example.com>"
- #. Setting the email address in the ``~/.bazaar/bazaar.conf`` [1]_ by adding the following lines.
- Please note that ``[DEFAULT]`` is case sensitive::
- [DEFAULT]
- email= Your Name <email at isp.com>
-
- As above, you can override this settings on a branch by branch basis by
- creating a branch section in ``~/.bazaar/locations.conf`` and adding the
- following lines::
- [/the/path/to/the/branch]
- email=Your Name <email at isp.com>
+ #. Setting the email address in the ``~/.bazaar/bazaar.conf`` [1]_ by
+ adding the following lines. Please note that ``[DEFAULT]`` is case
+ sensitive::
+
+ [DEFAULT]
+ email=Your Name <email at isp.com>
+
+ As above, you can override this settings on a branch by branch basis
+ by creating a branch section in ``~/.bazaar/locations.conf`` and
+ adding the following lines::
+
+ [/the/path/to/the/branch]
+ email=Your Name <email at isp.com>
#. Overriding the two previous options by setting the global environment
- variable ``$BZREMAIL`` or ``$EMAIL`` (``$BZREMAIL`` will take precedence)
- to your full email address.
+ variable ``$BZR_EMAIL`` or ``$EMAIL`` (``$BZR_EMAIL`` will take
+ precedence) to your full email address.
.. [1] On Windows, the users configuration files can be found in the
application data directory. So instead of ``~/.bazaar/branch.conf``
@@ -187,7 +190,7 @@
hello.txt
-If you add the wrong file, simply use **bzr remove** to make it
+If you add the wrong file, simply use ``bzr remove`` to make it
unversioned again. This does not delete the working copy in this case,
though it may in others [2]_.
@@ -202,7 +205,7 @@
All history is stored in a branch, which is just an on-disk directory
containing control files. By default there is no separate repository or
database as used in svn or svk. You can choose to create a repository if
-you want to (see the **bzr init-repo** command). You may wish to do this
+you want to (see the ``bzr init-repo`` command). You may wish to do this
if you have very large branches, or many branches of a moderately sized
project.
@@ -243,7 +246,7 @@
modified:
foo
-**bzr status** hides "boring" files that are either unchanged or ignored.
+``bzr status`` hides "boring" files that are either unchanged or ignored.
The status command can optionally be given the name of some files or
directories to check.
@@ -262,19 +265,20 @@
+hello world
-With the ''-r'' option, the tree is compared to an earlier revision, or
+With the ``-r`` option, the tree is compared to an earlier revision, or
the differences between two versions are shown::
% bzr diff -r 1000.. # everything since r1000
% bzr diff -r 1000..1100 # changes from 1000 to 1100
-The --diff-options option causes bzr to run the external diff program,
+The ``--diff-options`` option causes bzr to run the external diff program,
passing options. For example::
% bzr diff --diff-options --side-by-side foo
-Some projects prefer patches to show a prefix at the start of the path for
-old and new files. The --prefix option can be used to provide such a prefix.
+Some projects prefer patches to show a prefix at the start of the path
+for old and new files. The ``--prefix`` option can be used to provide
+such a prefix.
As a shortcut, ``bzr diff -p1`` produces a form that works with the
command ``patch -p1``.
@@ -290,7 +294,7 @@
The **commit** command takes a message describing the changes in the
revision. It also records your userid, the current time and timezone, and
the inventory and contents of the tree. The commit message is specified
-by the ''-m'' or ''--message'' option. You can enter a multi-line commit
+by the ``-m`` or ``--message`` option. You can enter a multi-line commit
message; in most shells you can enter this just by leaving the quotes open
at the end of the line.
@@ -298,7 +302,7 @@
% bzr commit -m "added my first file"
-You can also use the -F option to take the message from a file. Some
+You can also use the ``-F`` option to take the message from a file. Some
people like to make notes for a commit message while they work, then
review the diff to make sure they did what they said they did. (This file
can also be useful when you pick up your work after a break.)
@@ -306,10 +310,10 @@
Message from an editor
======================
-If you use neither the `-m` nor the `-F` option then bzr will open an
+If you use neither the ``-m`` nor the ``-F`` option then bzr will open an
editor for you to enter a message. The editor to run is controlled by
-your `$VISUAL` or `$EDITOR` environment variable, which can be overridden
-by the `editor` setting in to ~/.bazaar/bazaar.conf; `$BZR_EDITOR` will
+your ``$VISUAL`` or ``$EDITOR`` environment variable, which can be overridden
+by the ``editor`` setting in ``~/.bazaar/bazaar.conf``; ``$BZR_EDITOR`` will
override either of the above mentioned editor options. If you quit the
editor without making any changes, the commit will be cancelled.
@@ -332,9 +336,9 @@
If you've made some changes and don't want to keep them, use the
**revert** command to go back to the previous head version. It's a good
-idea to use **bzr diff** first to see what will be removed. By default the
+idea to use ``bzr diff`` first to see what will be removed. By default the
revert command reverts the whole tree; if file or directory names are
-given then only those ones will be affected. **revert** also clears the
+given then only those ones will be affected. ``bzr revert`` also clears the
list of pending merges revisions.
Ignoring files
@@ -344,7 +348,7 @@
such as editor backups, object or bytecode files, and built programs. You
can simply not add them, but then they'll always crop up as unknown files.
You can also tell bzr to ignore these files by adding them to a file
-called ''.bzrignore'' at the top of the tree.
+called ``.bzrignore`` at the top of the tree.
This file contains a list of file wildcards (or "globs"), one per line.
Typical contents are like this::
@@ -357,14 +361,14 @@
If a glob contains a slash, it is matched against the whole path from the
top of the tree; otherwise it is matched against only the filename. So
the previous example ignores files with extension ``.o`` in all
-subdirectories, but this example ignores only config.h at the top level
+subdirectories, but this example ignores only ``config.h`` at the top level
and HTML files in ``doc/``::
./config.h
doc/*.html
To get a list of which files are ignored and what pattern they matched,
-use ''bzr ignored''::
+use ``bzr ignored``::
% bzr ignored
config.h ./config.h
@@ -398,11 +402,11 @@
bzr log
-------
-The **bzr log** command shows a list of previous revisions. The **bzr log
---forward** command does the same in chronological order to get most
+The ``bzr log`` command shows a list of previous revisions. The ``bzr log
+--forward`` command does the same in chronological order to get most
recent revisions printed at last.
-As with bzr diff, bzr log supports the -r argument::
+As with ``bzr diff``, ``bzr log`` supports the ``-r`` argument::
% bzr log -r 1000.. # Revision 1000 and everything after it
% bzr log -r ..1000 # Everything up to and including r1000
@@ -413,7 +417,7 @@
Branch statistics
=================
-The **bzr info** command shows some summary information about the working
+The ``bzr info`` command shows some summary information about the working
tree and the branch history.
@@ -439,9 +443,9 @@
You can delete files or directories by just deleting them from the working
directory. This is a bit different to CVS, which requires that you also
-do **cvs remove**.
+do ``cvs remove``.
- **bzr remove** makes the file un-versioned, but may or may not delete
+ ``bzr remove`` makes the file un-versioned, but may or may not delete
the working copy [2]_. This is useful when you add the wrong file,
or decide that a file should actually not be versioned.
@@ -458,7 +462,7 @@
unknown:
hello.txt
-If you remove the wrong file by accident, you can use **bzr revert** to
+If you remove the wrong file by accident, you can use ``bzr revert`` to
restore it.
@@ -500,8 +504,8 @@
Merging from related branches
=============================
-If two branches have diverged (both have unique changes) then **bzr
-merge** is the appropriate command to use. Merge will automatically
+If two branches have diverged (both have unique changes) then ``bzr
+merge`` is the appropriate command to use. Merge will automatically
calculate the changes that exist in the branch you're merging from that
are not in your branch and attempt to apply them in your branch.
@@ -548,7 +552,7 @@
(The destination directory must already exist unless the
``--create-prefix`` option is used.)
-* Another option is the rspush plugin that comes with BzrTools, which
+* Another option is the ``rspush`` plugin that comes with BzrTools, which
uses rsync to push the changes to the revision history and the working
tree.
@@ -574,8 +578,8 @@
This will apply all of the uncommitted changes you made in OLDDIR to NEWDIR.
It will not apply committed changes, even if they could be applied to NEWDIR
-with a regular merge. The changes will remain in OLDDIR, but you can use **bzr
-revert OLDDIR** to remove them, once you're satisfied with NEWDIR.
+with a regular merge. The changes will remain in OLDDIR, but you can use ``bzr
+revert OLDDIR`` to remove them, once you're satisfied with NEWDIR.
NEWDIR does not have to be a copy of OLDDIR, but they should be related.
The more different they are, the greater the chance of conflicts.
=== modified directory // last-changed:fullermd at over-yonder.net-20070606095255
... -zogzpvrnhh5su387
# revision id: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
# sha1: 69d1356361df79e623f5731e3845b1ee4bd82f7e
# inventory sha1: 64f1b13e5b7dfb8c845915de2de2e4b2bf73c293
# parent ids:
# fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
# base id: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
# properties:
# branch-nick: tutorial-updates
# message:
# $BZREMAIL has been spelt $BZR_EMAIL for almost a year now, so it's
# probably time to tell the tutorial about it...
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Wed 2007-06-06 04:48:41.220999956 -0500
=== modified file doc/tutorial.txt // encoding:base64
LS0tIGRvYy90dXRvcmlhbC50eHQKKysrIGRvYy90dXRvcmlhbC50eHQKQEAgLTE0NSw4ICsxNDUs
OCBAQAogCiAKICAjLiBPdmVycmlkaW5nIHRoZSB0d28gcHJldmlvdXMgb3B0aW9ucyBieSBzZXR0
aW5nIHRoZSBnbG9iYWwgZW52aXJvbm1lbnQKLSAgICB2YXJpYWJsZSBgYCRCWlJFTUFJTGBgIG9y
IGBgJEVNQUlMYGAgKGBgJEJaUkVNQUlMYGAgd2lsbCB0YWtlIHByZWNlZGVuY2UpIAotICAgIHRv
IHlvdXIgZnVsbCBlbWFpbCBhZGRyZXNzLgorICAgIHZhcmlhYmxlIGBgJEJaUl9FTUFJTGBgIG9y
IGBgJEVNQUlMYGAgKGBgJEJaUl9FTUFJTGBgIHdpbGwgdGFrZQorICAgIHByZWNlZGVuY2UpIHRv
IHlvdXIgZnVsbCBlbWFpbCBhZGRyZXNzLgogCiAuLiBbMV0gT24gV2luZG93cywgdGhlIHVzZXJz
IGNvbmZpZ3VyYXRpb24gZmlsZXMgY2FuIGJlIGZvdW5kIGluIHRoZQogICAgYXBwbGljYXRpb24g
ZGF0YSBkaXJlY3RvcnkuIFNvIGluc3RlYWQgb2YgYGB+Ly5iYXphYXIvYnJhbmNoLmNvbmZgYAoK
=== modified directory // last-changed:fullermd at over-yonder.net-20070606094841
... -btejyqo11l309q1j
# revision id: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
# sha1: 6b64996a8b51e46db8125081079e18565a34adbf
# inventory sha1: dccce357f333c7f911bb875f79f322c567318077
# parent ids:
# fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
# properties:
# branch-nick: tutorial-updates
# message:
# Adjust some stuff on the Introducing Yourself section so that it
# literal's and blockquote's properly.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Wed 2007-06-06 04:47:02.436000109 -0500
=== modified file doc/tutorial.txt // encoding:base64
LS0tIGRvYy90dXRvcmlhbC50eHQKKysrIGRvYy90dXRvcmlhbC50eHQKQEAgLTEyOSwxNiArMTI5
LDE5IEBACiAgCiAgICAgJSBienIgd2hvYW1pIC0tYnJhbmNoICJZb3VyIE5hbWUgPGVtYWlsQGV4
YW1wbGUuY29tPiIKICAKLSAjLiBTZXR0aW5nIHRoZSBlbWFpbCBhZGRyZXNzIGluIHRoZSBgYH4v
LmJhemFhci9iYXphYXIuY29uZmBgIFsxXV8gYnkgYWRkaW5nIHRoZSBmb2xsb3dpbmcgbGluZXMu
Ci0gICAgUGxlYXNlIG5vdGUgdGhhdCAgYGBbREVGQVVMVF1gYCBpcyBjYXNlIHNlbnNpdGl2ZTo6
Ci0gICAgW0RFRkFVTFRdCi0gICAgZW1haWw9IFlvdXIgTmFtZSA8ZW1haWxAaXNwLmNvbT4KLSAK
LSAgICBBcyBhYm92ZSwgeW91IGNhbiBvdmVycmlkZSB0aGlzIHNldHRpbmdzIG9uIGEgYnJhbmNo
IGJ5IGJyYW5jaCBiYXNpcyBieQotICAgIGNyZWF0aW5nIGEgYnJhbmNoIHNlY3Rpb24gaW4gYGB+
Ly5iYXphYXIvbG9jYXRpb25zLmNvbmZgYCBhbmQgYWRkaW5nIHRoZQotICAgIGZvbGxvd2luZyBs
aW5lczo6Ci0gICAgWy90aGUvcGF0aC90by90aGUvYnJhbmNoXQotICAgIGVtYWlsPVlvdXIgTmFt
ZSA8ZW1haWxAaXNwLmNvbT4KKyAjLiBTZXR0aW5nIHRoZSBlbWFpbCBhZGRyZXNzIGluIHRoZSBg
YH4vLmJhemFhci9iYXphYXIuY29uZmBgIFsxXV8gYnkKKyAgICBhZGRpbmcgdGhlIGZvbGxvd2lu
ZyBsaW5lcy4gIFBsZWFzZSBub3RlIHRoYXQgIGBgW0RFRkFVTFRdYGAgaXMgY2FzZQorICAgIHNl
bnNpdGl2ZTo6CisKKyAgICAgICAgW0RFRkFVTFRdCisgICAgICAgIGVtYWlsPVlvdXIgTmFtZSA8
ZW1haWxAaXNwLmNvbT4KKworICAgIEFzIGFib3ZlLCB5b3UgY2FuIG92ZXJyaWRlIHRoaXMgc2V0
dGluZ3Mgb24gYSBicmFuY2ggYnkgYnJhbmNoIGJhc2lzCisgICAgYnkgY3JlYXRpbmcgYSBicmFu
Y2ggc2VjdGlvbiBpbiBgYH4vLmJhemFhci9sb2NhdGlvbnMuY29uZmBgIGFuZAorICAgIGFkZGlu
ZyB0aGUgZm9sbG93aW5nIGxpbmVzOjoKKworICAgICAgICBbL3RoZS9wYXRoL3RvL3RoZS9icmFu
Y2hdCisgICAgICAgIGVtYWlsPVlvdXIgTmFtZSA8ZW1haWxAaXNwLmNvbT4KIAogCiAgIy4gT3Zl
cnJpZGluZyB0aGUgdHdvIHByZXZpb3VzIG9wdGlvbnMgYnkgc2V0dGluZyB0aGUgZ2xvYmFsIGVu
dmlyb25tZW50Cgo=
=== modified directory // last-changed:fullermd at over-yonder.net-20070606094702
... -k1ney72w3wktv3ev
# revision id: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
# sha1: da4623d4e17e23c575ed56e5d8ac6064b1e5dfea
# inventory sha1: c7b857730bcd08e4c02a130879a005d55b0e1666
# parent ids:
# fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
# properties:
# branch-nick: tutorial-updates
# message:
# Use `` instead of ` around a bunch of options and env variable namings
# when talking about editor settings.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Wed 2007-06-06 04:39:09.381000042 -0500
=== modified file doc/tutorial.txt // encoding:base64
LS0tIGRvYy90dXRvcmlhbC50eHQKKysrIGRvYy90dXRvcmlhbC50eHQKQEAgLTMwNiwxMCArMzA2
LDEwIEBACiBNZXNzYWdlIGZyb20gYW4gZWRpdG9yCiA9PT09PT09PT09PT09PT09PT09PT09CiAK
LUlmIHlvdSB1c2UgbmVpdGhlciB0aGUgYC1tYCBub3IgdGhlIGAtRmAgb3B0aW9uIHRoZW4gYnpy
IHdpbGwgb3BlbiBhbgorSWYgeW91IHVzZSBuZWl0aGVyIHRoZSBgYC1tYGAgbm9yIHRoZSBgYC1G
YGAgb3B0aW9uIHRoZW4gYnpyIHdpbGwgb3BlbiBhbgogZWRpdG9yIGZvciB5b3UgdG8gZW50ZXIg
YSBtZXNzYWdlLiAgVGhlIGVkaXRvciB0byBydW4gaXMgY29udHJvbGxlZCBieQoteW91ciBgJFZJ
U1VBTGAgb3IgYCRFRElUT1JgIGVudmlyb25tZW50IHZhcmlhYmxlLCB3aGljaCBjYW4gYmUgb3Zl
cnJpZGRlbgotYnkgdGhlIGBlZGl0b3JgIHNldHRpbmcgaW4gdG8gfi8uYmF6YWFyL2JhemFhci5j
b25mOyBgJEJaUl9FRElUT1JgIHdpbGwKK3lvdXIgYGAkVklTVUFMYGAgb3IgYGAkRURJVE9SYGAg
ZW52aXJvbm1lbnQgdmFyaWFibGUsIHdoaWNoIGNhbiBiZSBvdmVycmlkZGVuCitieSB0aGUgYGBl
ZGl0b3JgYCBzZXR0aW5nIGluIGBgfi8uYmF6YWFyL2JhemFhci5jb25mYGA7IGBgJEJaUl9FRElU
T1JgYCB3aWxsCiBvdmVycmlkZSBlaXRoZXIgb2YgdGhlIGFib3ZlIG1lbnRpb25lZCBlZGl0b3Ig
b3B0aW9ucy4gIElmIHlvdSBxdWl0IHRoZQogZWRpdG9yIHdpdGhvdXQgbWFraW5nIGFueSBjaGFu
Z2VzLCB0aGUgY29tbWl0IHdpbGwgYmUgY2FuY2VsbGVkLgogCgo=
=== modified directory // last-changed:fullermd at over-yonder.net-20070606093909
... -stozkguj77gorg94
# revision id: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
# sha1: 5b686841590bf687ca2215aaa3c5e6ae2e1167a6
# inventory sha1: 5e8d1526d42ea7fd548cc45d18ed66164172a05d
# parent ids:
# fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
# properties:
# branch-nick: tutorial-updates
# message:
# Be consistent about using `` instead of ** around commands.
#
# There are some places that command _names_ are left in **'s, on the
# theory that they're really describing concepts rather than commands.
#
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Wed 2007-06-06 04:31:02.361999989 -0500
=== modified file doc/tutorial.txt // encoding:base64
LS0tIGRvYy90dXRvcmlhbC50eHQKKysrIGRvYy90dXRvcmlhbC50eHQKQEAgLTE4Nyw3ICsxODcs
NyBAQAogICAgICAgaGVsbG8udHh0CiAKIAotSWYgeW91IGFkZCB0aGUgd3JvbmcgZmlsZSwgc2lt
cGx5IHVzZSAqKmJ6ciByZW1vdmUqKiB0byBtYWtlIGl0CitJZiB5b3UgYWRkIHRoZSB3cm9uZyBm
aWxlLCBzaW1wbHkgdXNlIGBgYnpyIHJlbW92ZWBgIHRvIG1ha2UgaXQKIHVudmVyc2lvbmVkIGFn
YWluLiAgVGhpcyBkb2VzIG5vdCBkZWxldGUgdGhlIHdvcmtpbmcgY29weSBpbiB0aGlzIGNhc2Us
CiB0aG91Z2ggaXQgbWF5IGluIG90aGVycyBbMl1fLgogCkBAIC0yMDIsNyArMjAyLDcgQEAKIEFs
bCBoaXN0b3J5IGlzIHN0b3JlZCBpbiBhIGJyYW5jaCwgd2hpY2ggaXMganVzdCBhbiBvbi1kaXNr
IGRpcmVjdG9yeQogY29udGFpbmluZyBjb250cm9sIGZpbGVzLiAgQnkgZGVmYXVsdCB0aGVyZSBp
cyBubyBzZXBhcmF0ZSByZXBvc2l0b3J5IG9yCiBkYXRhYmFzZSBhcyB1c2VkIGluIHN2biBvciBz
dmsuIFlvdSBjYW4gY2hvb3NlIHRvIGNyZWF0ZSBhIHJlcG9zaXRvcnkgaWYKLXlvdSB3YW50IHRv
IChzZWUgdGhlICoqYnpyIGluaXQtcmVwbyoqIGNvbW1hbmQpLiBZb3UgbWF5IHdpc2ggdG8gZG8g
dGhpcworeW91IHdhbnQgdG8gKHNlZSB0aGUgYGBienIgaW5pdC1yZXBvYGAgY29tbWFuZCkuIFlv
dSBtYXkgd2lzaCB0byBkbyB0aGlzCiBpZiB5b3UgaGF2ZSB2ZXJ5IGxhcmdlIGJyYW5jaGVzLCBv
ciBtYW55IGJyYW5jaGVzIG9mIGEgbW9kZXJhdGVseSBzaXplZAogcHJvamVjdC4KIApAQCAtMjQz
LDcgKzI0Myw3IEBACiAgICAgbW9kaWZpZWQ6CiAgICAgICAgZm9vCiAKLSoqYnpyIHN0YXR1cyoq
IGhpZGVzICJib3JpbmciIGZpbGVzIHRoYXQgYXJlIGVpdGhlciB1bmNoYW5nZWQgb3IgaWdub3Jl
ZC4KK2BgYnpyIHN0YXR1c2BgIGhpZGVzICJib3JpbmciIGZpbGVzIHRoYXQgYXJlIGVpdGhlciB1
bmNoYW5nZWQgb3IgaWdub3JlZC4KIFRoZSBzdGF0dXMgY29tbWFuZCBjYW4gb3B0aW9uYWxseSBi
ZSBnaXZlbiB0aGUgbmFtZSBvZiBzb21lIGZpbGVzIG9yCiBkaXJlY3RvcmllcyB0byBjaGVjay4K
IApAQCAtMzMyLDkgKzMzMiw5IEBACiAKIElmIHlvdSd2ZSBtYWRlIHNvbWUgY2hhbmdlcyBhbmQg
ZG9uJ3Qgd2FudCB0byBrZWVwIHRoZW0sIHVzZSB0aGUKICoqcmV2ZXJ0KiogY29tbWFuZCB0byBn
byBiYWNrIHRvIHRoZSBwcmV2aW91cyBoZWFkIHZlcnNpb24uICBJdCdzIGEgZ29vZAotaWRlYSB0
byB1c2UgKipienIgZGlmZioqIGZpcnN0IHRvIHNlZSB3aGF0IHdpbGwgYmUgcmVtb3ZlZC4gQnkg
ZGVmYXVsdCB0aGUKK2lkZWEgdG8gdXNlIGBgYnpyIGRpZmZgYCBmaXJzdCB0byBzZWUgd2hhdCB3
aWxsIGJlIHJlbW92ZWQuIEJ5IGRlZmF1bHQgdGhlCiByZXZlcnQgY29tbWFuZCByZXZlcnRzIHRo
ZSB3aG9sZSB0cmVlOyBpZiBmaWxlIG9yIGRpcmVjdG9yeSBuYW1lcyBhcmUKLWdpdmVuIHRoZW4g
b25seSB0aG9zZSBvbmVzIHdpbGwgYmUgYWZmZWN0ZWQuICoqcmV2ZXJ0KiogYWxzbyBjbGVhcnMg
dGhlCitnaXZlbiB0aGVuIG9ubHkgdGhvc2Ugb25lcyB3aWxsIGJlIGFmZmVjdGVkLiBgYGJ6ciBy
ZXZlcnRgYCBhbHNvIGNsZWFycyB0aGUKIGxpc3Qgb2YgcGVuZGluZyBtZXJnZXMgcmV2aXNpb25z
LgogCiBJZ25vcmluZyBmaWxlcwpAQCAtMzY0LDcgKzM2NCw3IEBACiAgICAgZG9jLyouaHRtbAog
CiBUbyBnZXQgYSBsaXN0IG9mIHdoaWNoIGZpbGVzIGFyZSBpZ25vcmVkIGFuZCB3aGF0IHBhdHRl
cm4gdGhleSBtYXRjaGVkLAotdXNlICcnYnpyIGlnbm9yZWQnJzo6Cit1c2UgYGBienIgaWdub3Jl
ZGBgOjoKIAogICAgICUgYnpyIGlnbm9yZWQKICAgICBjb25maWcuaCAgICAgICAgICAgICAgICAg
Li9jb25maWcuaApAQCAtMzk4LDExICszOTgsMTEgQEAKIGJ6ciBsb2cKIC0tLS0tLS0KIAotVGhl
ICoqYnpyIGxvZyoqIGNvbW1hbmQgc2hvd3MgYSBsaXN0IG9mIHByZXZpb3VzIHJldmlzaW9ucy4g
VGhlICoqYnpyIGxvZwotLS1mb3J3YXJkKiogY29tbWFuZCBkb2VzIHRoZSBzYW1lIGluIGNocm9u
b2xvZ2ljYWwgb3JkZXIgdG8gZ2V0IG1vc3QKK1RoZSBgYGJ6ciBsb2dgYCBjb21tYW5kIHNob3dz
IGEgbGlzdCBvZiBwcmV2aW91cyByZXZpc2lvbnMuIFRoZSBgYGJ6ciBsb2cKKy0tZm9yd2FyZGBg
IGNvbW1hbmQgZG9lcyB0aGUgc2FtZSBpbiBjaHJvbm9sb2dpY2FsIG9yZGVyIHRvIGdldCBtb3N0
CiByZWNlbnQgcmV2aXNpb25zIHByaW50ZWQgYXQgbGFzdC4KIAotQXMgd2l0aCBienIgZGlmZiwg
YnpyIGxvZyBzdXBwb3J0cyB0aGUgLXIgYXJndW1lbnQ6OgorQXMgd2l0aCBgYGJ6ciBkaWZmYGAs
IGBgYnpyIGxvZ2BgIHN1cHBvcnRzIHRoZSBgYC1yYGAgYXJndW1lbnQ6OgogCiAgICAgJSBienIg
bG9nIC1yIDEwMDAuLiAgICAgICAgICAjIFJldmlzaW9uIDEwMDAgYW5kIGV2ZXJ5dGhpbmcgYWZ0
ZXIgaXQKICAgICAlIGJ6ciBsb2cgLXIgLi4xMDAwICAgICAgICAgICMgRXZlcnl0aGluZyB1cCB0
byBhbmQgaW5jbHVkaW5nIHIxMDAwCkBAIC00MTMsNyArNDEzLDcgQEAKIEJyYW5jaCBzdGF0aXN0
aWNzCiA9PT09PT09PT09PT09PT09PQogCi1UaGUgKipienIgaW5mbyoqIGNvbW1hbmQgc2hvd3Mg
c29tZSBzdW1tYXJ5IGluZm9ybWF0aW9uIGFib3V0IHRoZSB3b3JraW5nCitUaGUgYGBienIgaW5m
b2BgIGNvbW1hbmQgc2hvd3Mgc29tZSBzdW1tYXJ5IGluZm9ybWF0aW9uIGFib3V0IHRoZSB3b3Jr
aW5nCiB0cmVlIGFuZCB0aGUgYnJhbmNoIGhpc3RvcnkuICAKIAogCkBAIC00MzksOSArNDM5LDkg
QEAKIAogWW91IGNhbiBkZWxldGUgZmlsZXMgb3IgZGlyZWN0b3JpZXMgYnkganVzdCBkZWxldGlu
ZyB0aGVtIGZyb20gdGhlIHdvcmtpbmcKIGRpcmVjdG9yeS4gIFRoaXMgaXMgYSBiaXQgZGlmZmVy
ZW50IHRvIENWUywgd2hpY2ggcmVxdWlyZXMgdGhhdCB5b3UgYWxzbwotZG8gKipjdnMgcmVtb3Zl
KiouCitkbyBgYGN2cyByZW1vdmVgYC4KIAotICAgICoqYnpyIHJlbW92ZSoqIG1ha2VzIHRoZSBm
aWxlIHVuLXZlcnNpb25lZCwgYnV0IG1heSBvciBtYXkgbm90IGRlbGV0ZQorICAgIGBgYnpyIHJl
bW92ZWBgIG1ha2VzIHRoZSBmaWxlIHVuLXZlcnNpb25lZCwgYnV0IG1heSBvciBtYXkgbm90IGRl
bGV0ZQogICAgIHRoZSB3b3JraW5nIGNvcHkgWzJdXy4gIFRoaXMgaXMgdXNlZnVsIHdoZW4geW91
IGFkZCB0aGUgd3JvbmcgZmlsZSwKICAgICBvciBkZWNpZGUgdGhhdCBhIGZpbGUgc2hvdWxkIGFj
dHVhbGx5IG5vdCBiZSB2ZXJzaW9uZWQuIAogCkBAIC00NTgsNyArNDU4LDcgQEAKICAgICB1bmtu
b3duOgogICAgICAgaGVsbG8udHh0CiAKLUlmIHlvdSByZW1vdmUgdGhlIHdyb25nIGZpbGUgYnkg
YWNjaWRlbnQsIHlvdSBjYW4gdXNlICoqYnpyIHJldmVydCoqIHRvCitJZiB5b3UgcmVtb3ZlIHRo
ZSB3cm9uZyBmaWxlIGJ5IGFjY2lkZW50LCB5b3UgY2FuIHVzZSBgYGJ6ciByZXZlcnRgYCB0bwog
cmVzdG9yZSBpdC4KIAogCkBAIC01MDAsOCArNTAwLDggQEAKIE1lcmdpbmcgZnJvbSByZWxhdGVk
IGJyYW5jaGVzCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PQogCi1JZiB0d28gYnJhbmNo
ZXMgaGF2ZSBkaXZlcmdlZCAoYm90aCBoYXZlIHVuaXF1ZSBjaGFuZ2VzKSB0aGVuICoqYnpyCi1t
ZXJnZSoqIGlzIHRoZSBhcHByb3ByaWF0ZSBjb21tYW5kIHRvIHVzZS4gTWVyZ2Ugd2lsbCBhdXRv
bWF0aWNhbGx5CitJZiB0d28gYnJhbmNoZXMgaGF2ZSBkaXZlcmdlZCAoYm90aCBoYXZlIHVuaXF1
ZSBjaGFuZ2VzKSB0aGVuIGBgYnpyCittZXJnZWBgIGlzIHRoZSBhcHByb3ByaWF0ZSBjb21tYW5k
IHRvIHVzZS4gTWVyZ2Ugd2lsbCBhdXRvbWF0aWNhbGx5CiBjYWxjdWxhdGUgdGhlIGNoYW5nZXMg
dGhhdCBleGlzdCBpbiB0aGUgYnJhbmNoIHlvdSdyZSBtZXJnaW5nIGZyb20gdGhhdAogYXJlIG5v
dCBpbiB5b3VyIGJyYW5jaCBhbmQgYXR0ZW1wdCB0byBhcHBseSB0aGVtIGluIHlvdXIgYnJhbmNo
LgogCkBAIC01NDgsNyArNTQ4LDcgQEAKICAgKFRoZSBkZXN0aW5hdGlvbiBkaXJlY3RvcnkgbXVz
dCBhbHJlYWR5IGV4aXN0IHVubGVzcyB0aGUKICAgYGAtLWNyZWF0ZS1wcmVmaXhgYCBvcHRpb24g
aXMgdXNlZC4pCiAKLSogQW5vdGhlciBvcHRpb24gaXMgdGhlIHJzcHVzaCBwbHVnaW4gdGhhdCBj
b21lcyB3aXRoIEJ6clRvb2xzLCB3aGljaAorKiBBbm90aGVyIG9wdGlvbiBpcyB0aGUgYGByc3B1
c2hgYCBwbHVnaW4gdGhhdCBjb21lcyB3aXRoIEJ6clRvb2xzLCB3aGljaAogICB1c2VzIHJzeW5j
IHRvIHB1c2ggdGhlIGNoYW5nZXMgdG8gdGhlIHJldmlzaW9uIGhpc3RvcnkgYW5kIHRoZSB3b3Jr
aW5nCiAgIHRyZWUuCiAKQEAgLTU3NCw4ICs1NzQsOCBAQAogCiBUaGlzIHdpbGwgYXBwbHkgYWxs
IG9mIHRoZSB1bmNvbW1pdHRlZCBjaGFuZ2VzIHlvdSBtYWRlIGluIE9MRERJUiB0byBORVdESVIu
CiBJdCB3aWxsIG5vdCBhcHBseSBjb21taXR0ZWQgY2hhbmdlcywgZXZlbiBpZiB0aGV5IGNvdWxk
IGJlIGFwcGxpZWQgdG8gTkVXRElSCi13aXRoIGEgcmVndWxhciBtZXJnZS4gIFRoZSBjaGFuZ2Vz
IHdpbGwgcmVtYWluIGluIE9MRERJUiwgYnV0IHlvdSBjYW4gdXNlICoqYnpyCi1yZXZlcnQgT0xE
RElSKiogdG8gcmVtb3ZlIHRoZW0sIG9uY2UgeW91J3JlIHNhdGlzZmllZCB3aXRoIE5FV0RJUi4K
K3dpdGggYSByZWd1bGFyIG1lcmdlLiAgVGhlIGNoYW5nZXMgd2lsbCByZW1haW4gaW4gT0xERElS
LCBidXQgeW91IGNhbiB1c2UgYGBienIKK3JldmVydCBPTERESVJgYCB0byByZW1vdmUgdGhlbSwg
b25jZSB5b3UncmUgc2F0aXNmaWVkIHdpdGggTkVXRElSLgogCiBORVdESVIgZG9lcyBub3QgaGF2
ZSB0byBiZSBhIGNvcHkgb2YgT0xERElSLCBidXQgdGhleSBzaG91bGQgYmUgcmVsYXRlZC4KIFRo
ZSBtb3JlIGRpZmZlcmVudCB0aGV5IGFyZSwgdGhlIGdyZWF0ZXIgdGhlIGNoYW5jZSBvZiBjb25m
bGljdHMuCgo=
=== modified directory // last-changed:fullermd at over-yonder.net-20070606093102
... -icchoupo52p6eiyq
# revision id: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
# sha1: e735337af3ec99f2e4f9d5668e59ae18f117cd02
# inventory sha1: b2fa0372a46ef14d1cd1a709ca63d9b6450c6d84
# parent ids:
# fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
# properties:
# branch-nick: tutorial-updates
More information about the bazaar
mailing list