At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4056
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Canonical.com Patch Queue Manager <[email protected]>
branch nick: +trunk
timestamp: Thu 2009-02-26 07:39:08 +0000
message:
(mbp, trivial) typos in documentation
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt
using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt
adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt
organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt
setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt
solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt
specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt
undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt
using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt
using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4054.1.1
revision-id: [email protected]
parent: [email protected]
parent: [email protected]
committer: Martin Pool <[email protected]>
branch nick: doc
timestamp: Thu 2009-02-26 17:58:20 +1100
message:
Merge typo fixes
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt
using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt
adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt
organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt
setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt
solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt
specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt
undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt
using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt
using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
------------------------------------------------------------
revno: 4011.6.1
revision-id: [email protected]
parent: [email protected]
committer: Frank Aspell <[email protected]>
branch nick: giveback2
timestamp: Tue 2009-02-17 12:40:05 +0100
message:
Fixed typos.
Fixed some typos in bzr doc's using "aspell -l en -c FILENAME".
modified:
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/tutorials/using_bazaar_with_launchpad.txt
using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt
adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/organizing_branches.txt
organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/setting_up_email.txt
setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/solo_intro.txt
solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/specifying_revisions.txt
specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/undoing_mistakes.txt
undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_aliases.txt
using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/using_gatekeepers.txt
using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
=== modified file 'doc/en/mini-tutorial/index.txt'
--- a/doc/en/mini-tutorial/index.txt 2008-08-02 17:10:50 +0000
+++ b/doc/en/mini-tutorial/index.txt 2009-02-17 11:40:05 +0000
@@ -70,7 +70,7 @@
directories, then right-click in those directories and select
``New file`` to create your files.
-Now get Bazaar to initalize itself in your project directory::
+Now get Bazaar to initialize itself in your project directory::
$ bzr init
=== modified file 'doc/en/tutorials/using_bazaar_with_launchpad.txt'
--- a/doc/en/tutorials/using_bazaar_with_launchpad.txt 2008-01-04 19:22:40
+0000
+++ b/doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-02-17 11:40:05
+0000
@@ -114,7 +114,7 @@
together on related issues and roadmaps.
In other words, Launchpad has been designed to help your
-comunity grow and to reduce the workflow friction both
+community grow and to reduce the workflow friction both
*within* your community and *between* communities. Ultimately,
that means less time on mechanical tasks and more time for
interesting development.
@@ -441,7 +441,7 @@
In particular, Launchpad is a free code hosting service for your Bazaar
branches, branches can be browsed online, branches can be linked to bugs
and blueprints, and the status of bug-branch relationships can be
-automatically managed by mentioning the bug while commiting in Bazaar.
+automatically managed by mentioning the bug while committing in Bazaar.
Further integration is under development with the aim of streamlining
the process from *great idea* to *running code in the hands of end users*.
=== modified file 'doc/en/user-guide/adv_merging.txt'
--- a/doc/en/user-guide/adv_merging.txt 2007-12-14 07:35:49 +0000
+++ b/doc/en/user-guide/adv_merging.txt 2009-02-17 11:40:05 +0000
@@ -64,7 +64,7 @@
Merging uncommitted changes
---------------------------
-If you have several branches and you accidently start making changes in the
+If you have several branches and you accidentally start making changes in the
wrong one, here are the steps to take to correct this. Assuming you began
working in branch ``foo`` when you meant to work in branch ``bar``:
=== modified file 'doc/en/user-guide/organizing_branches.txt'
--- a/doc/en/user-guide/organizing_branches.txt 2008-12-24 03:14:16 +0000
+++ b/doc/en/user-guide/organizing_branches.txt 2009-02-17 11:40:05 +0000
@@ -23,7 +23,7 @@
Each new feature or fix is developed in its own branch.
These branches are referred to as *feature branches* or
-*task branches* - the terms are used interchangably.
+*task branches* - the terms are used interchangeably.
To create a task branch, use the ``branch`` command
against your mirror branch. For example::
=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- a/doc/en/user-guide/setting_up_email.txt 2007-12-17 01:45:32 +0000
+++ b/doc/en/user-guide/setting_up_email.txt 2009-02-17 11:40:05 +0000
@@ -7,7 +7,7 @@
----------------------------------------
Bazaar stores the specified email address in revisions when they're
-created so that people can tell who commited which revisions. The
+created so that people can tell who committed which revisions. The
email addresses are not verified, therefore they could be bogus, so
you have to trust the people involved in your project. Additionally,
the email address in a revision gives others a way to contact the
@@ -62,7 +62,7 @@
--------------------------------------------
To use the default ini file, create or edit the ``bazaar.conf`` file (in
-``~/.bazaar/`` on Linix and in ``%APPDATA%\bazaar\2.0\`` in Windows)
+``~/.bazaar/`` on Linux and in ``%APPDATA%\bazaar\2.0\`` in Windows)
and set an email address as shown below. Please note that the word DEFAULT
is case sensitive, and must be in upper-case.
::
=== modified file 'doc/en/user-guide/solo_intro.txt'
--- a/doc/en/user-guide/solo_intro.txt 2007-11-23 05:52:03 +0000
+++ b/doc/en/user-guide/solo_intro.txt 2009-02-17 11:40:05 +0000
@@ -5,7 +5,7 @@
----------------------------
Some tools are designed to make individuals productive (e.g. editors)
-while other tools (e.g. back-end services) are focussed on making teams
+while other tools (e.g. back-end services) are focused on making teams
or whole companies more productive. Version control tools have
traditionally been in the latter camp.
=== modified file 'doc/en/user-guide/specifying_revisions.txt'
--- a/doc/en/user-guide/specifying_revisions.txt 2007-12-14 07:35:49
+0000
+++ b/doc/en/user-guide/specifying_revisions.txt 2009-02-17 11:40:05
+0000
@@ -93,7 +93,7 @@
**before**
''rev'' specifies the leftmost parent of ''rev'', that is the revision
that appears before ''rev'' in the revision history, or the revision that
- was current when ''rev'' what comitted.
+ was current when ''rev'' what committed.
''rev'' can be any revision specifier and may be chained.
=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
--- a/doc/en/user-guide/undoing_mistakes.txt 2008-09-03 21:29:15 +0000
+++ b/doc/en/user-guide/undoing_mistakes.txt 2009-02-17 11:40:05 +0000
@@ -10,13 +10,13 @@
Dropping the revision history for a project
-------------------------------------------
-If you accidently put the wrong tree under version control, simply
+If you accidentally put the wrong tree under version control, simply
delete the ``.bzr`` directory.
Deregistering a file or directory
---------------------------------
-If you accidently register a file using ``add`` that you
+If you accidentally register a file using ``add`` that you
don't want version controlled, you can use the ``remove``
command to tell Bazaar to forget about it.
=== modified file 'doc/en/user-guide/using_aliases.txt'
--- a/doc/en/user-guide/using_aliases.txt 2007-11-30 04:28:32 +0000
+++ b/doc/en/user-guide/using_aliases.txt 2009-02-17 11:40:05 +0000
@@ -50,7 +50,7 @@
``commit --no-strict``.
* Aliases can override the standard behaviour of existing commands by giving
- an alias name that is the same as the orignal command. For example, default
+ an alias name that is the same as the original command. For example, default
commit is changed with ``commit=commit --strict``.
* Aliases cannot refer to other aliases. In other words making a
=== modified file 'doc/en/user-guide/using_gatekeepers.txt'
--- a/doc/en/user-guide/using_gatekeepers.txt 2007-11-23 15:45:20 +0000
+++ b/doc/en/user-guide/using_gatekeepers.txt 2009-02-17 11:40:05 +0000
@@ -22,7 +22,7 @@
acceptable, indeed common, to have multiple central branches with
different gatekeepers, e.g. one branch for the current production
release and another for the next release. In this case, a task branch
-holding a bug fix will most likely be advertized to both gatekeepers.
+holding a bug fix will most likely be advertised to both gatekeepers.
One of the great things about this workflow is that it is hugely
scalable. Large projects can be broken into teams and each
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
