← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/controlling_registration.txt

  • Committer: John Arbash Meinel
  • Date: 2009-12-02 23:09:40 UTC
  • mfrom: (4853.1.1 whitespace)
  • mto: This revision was merged to the branch mainline in revision 4856.
  • Revision ID: john@arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
Strip trailing whitespace from doc files by Patrick Regan.

Resolve one small conflict with another doc edit.
Also, revert the changes to all the .pdf and .png files. We shouldn't
be touching them as they are pure-binary files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/controlling_registration.txt
100
100
 
101
101
.. [#] On Windows, the users configuration files can be found in the
102
102
   application data directory. So instead of ``~/.bazaar/branch.conf``
103
 
   the configuration file can be found as: 
 
103
   the configuration file can be found as:
104
104
   ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\branch.conf``.
105
105
   The same is true for ``locations.conf``, ``ignore``, and the
106
106
   ``plugins`` directory.