Rev 2969: (Matt Nordhoff) Fix a few typos in the knitpack.txt doc in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2969
revision-id: pqm at pqm.ubuntu.com-20071106075622-sxakuumohuzvb9vx
parent: pqm at pqm.ubuntu.com-20071106070621-hu1s7o5fphvhxw8m
parent: bialix at ukr.net-20071106063944-v0xj3dzrbt05gjeu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-11-06 07:56:22 +0000
message:
  (Matt Nordhoff) Fix a few typos in the knitpack.txt doc   	
modified:
  doc/developers/knitpack.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
    ------------------------------------------------------------
    revno: 2967.1.1
    merged: bialix at ukr.net-20071106063944-v0xj3dzrbt05gjeu
    parent: pqm at pqm.ubuntu.com-20071105211156-bwx6vf8f88m247cy
    parent: mnordhoff at mattnordhoff.com-20071031190726-kuc6m0yl48hk3tqt
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: matt.n
    timestamp: Tue 2007-11-06 08:39:44 +0200
    message:
      [merge] Fix a few typos in the knitpack.txt doc
    ------------------------------------------------------------
    revno: 2955.4.2
    merged: mnordhoff at mattnordhoff.com-20071031190726-kuc6m0yl48hk3tqt
    parent: mnordhoff at mattnordhoff.com-20071031190401-t0uk5hxby3vh01ie
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: knitpack-typo
    timestamp: Wed 2007-10-31 15:07:26 -0400
    message:
      Remove excess whitespace from the knitpack.txt doc.
    ------------------------------------------------------------
    revno: 2955.4.1
    merged: mnordhoff at mattnordhoff.com-20071031190401-t0uk5hxby3vh01ie
    parent: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
    committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
    branch nick: knitpack-typo
    timestamp: Wed 2007-10-31 15:04:01 -0400
    message:
      Fix a few typos in the knitpack.txt doc.
=== modified file 'doc/developers/knitpack.txt'
--- a/doc/developers/knitpack.txt	2007-10-25 22:42:02 +0000
+++ b/doc/developers/knitpack.txt	2007-10-31 19:07:26 +0000
@@ -111,7 +111,7 @@
   bzr init-repo --knitpack-experimental .
   bzr branch my-source-branch my-new-branch
   cd my-new-branch
- 
+
 As a reminder, any of the above approaches can fail if the source branch
 has inconsistent data within it and hasn't been reconciled yet. Please
 be sure to check that before reporting problems.
@@ -124,10 +124,10 @@
 are identical to the ones given above except that the name of the format
 to use is ``knitpack-subtree-experimental``.
 
-WARNING: Note that the subtree formats, ``distate-subtree`` and
+WARNING: Note that the subtree formats, ``dirstate-subtree`` and
 ``knitpack-subtree-experimental``, are **not** production strength yet and
 may cause unexpected problems. They are required for the bzr-svn
-plug-in but should otherwise ony be used by people happy to live on the
+plug-in but should otherwise only be used by people happy to live on the
 bleeding edge. If you are using bzr-svn, you're on the bleeding edge anyway.
 :-)
 
@@ -143,7 +143,7 @@
 ===============
 
 Bazaar 0.92 adds a new format (experimental at first) implemented in
-``bzrlib.repofmt.pack_repo.py``.  
+``bzrlib.repofmt.pack_repo.py``.
 
 This format provides a knit-like interface which is quite compatible
 with knit format repositories: you can get a VersionedFile for a
@@ -156,9 +156,9 @@
 ==================== =============================================
 packs/               completed readonly packs
 indices/             indices for completed packs
-upload/              temporary files for packs currently being 
+upload/              temporary files for packs currently being
                      written
-obsolete_packs/      packs that have been repacked and are no 
+obsolete_packs/      packs that have been repacked and are no
                      longer normally needed
 pack-names           index of all live packs
 lock/                lockdir
@@ -184,13 +184,13 @@
                                              compression base
 ======== ========== ======================== ==========================
 
-Indices are accessed through the ``bzrlib.index.GraphIndex`` class.  
+Indices are accessed through the ``bzrlib.index.GraphIndex`` class.
 Indices are stored as sorted files on disk.  Each line is one record,
 and contains:
 
  * key fields
  * a value string - for all these indices, this is an ascii decimal pair
-   of "offset length" giving the position of the refenced data within 
+   of "offset length" giving the position of the referenced data within
    the pack body file
  * a list of zero or more reference lists
 
@@ -219,7 +219,7 @@
 
 It is not possible to regenerate an index from the body file, because it
 contains information stored in the knit index that's not in the body.
-(In particular, the per-file graph is only stored in the index.) 
+(In particular, the per-file graph is only stored in the index.)
 We would like to change this in a future format.
 
 The lock is a regular LockDir lock.  The lock is only held for a much
@@ -227,13 +227,13 @@
 insertion can be done without the repository locked.  This is an
 implementation detail; the repository user should still call
 ``repository.lock_write`` at the regular time but be aware this does not
-correspond to a physical mutex. 
+correspond to a physical mutex.
 
 Read locks control caching but do not affect writers.
 
 The newly-added repository write group concept is very important to
 KnitPack repositories.  When ``start_write_group`` is called, a new
-temporary pack is created and all modifications to the repository will 
+temporary pack is created and all modifications to the repository will
 go into it until either ``commit_write_group`` or ``abort_write_group``
 is called, at which time it is either finished and moved into place or
 discarded respectively.  Write groups cannot be nested, only one can be
@@ -251,7 +251,7 @@
 ``packs/`` directory, but the file is needed for readonly http clients
 that can't easily list directories, and it includes other information.)
 The constraint on the ``pack-names`` list is that every file mentioned
-must exist in the ``packs/`` directory.  
+must exist in the ``packs/`` directory.
 
 In rare cases, when a writer is interrupted, about-to-be-removed packs
 may still be present in the directory but removed from the list.