Bazaar

Merge lp:~mbp/bzr/doc into lp:bzr

  1. doc
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5297
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 21 lines (+2/-2)
1 file modified
bzrlib/osutils.py (+2/-2)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+27579@code.launchpad.net

Commit message

additional gnu doc style fixes

Description of the change

Just a couple more fixes towards https://bugs.edge.launchpad.net/bzr/+bug/528253 pointed out by Karl Berry.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Trivial enough to not even need a review, please land.

review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py 2010-05-27 17:59:18 +0000
+++ bzrlib/osutils.py 2010-06-15 06:06:31 +0000
@@ -1321,7 +1321,7 @@
1321def normalizes_filenames():1321def normalizes_filenames():
1322 """Return True if this platform normalizes unicode filenames.1322 """Return True if this platform normalizes unicode filenames.
13231323
1324 Mac OSX does, Windows/Linux do not.1324 Only Mac OSX.
1325 """1325 """
1326 return _platform_normalizes_filenames1326 return _platform_normalizes_filenames
13271327
@@ -1332,7 +1332,7 @@
1332 On platforms where the system normalizes filenames (Mac OSX),1332 On platforms where the system normalizes filenames (Mac OSX),
1333 you can access a file by any path which will normalize correctly.1333 you can access a file by any path which will normalize correctly.
1334 On platforms where the system does not normalize filenames1334 On platforms where the system does not normalize filenames
1335 (Windows, Linux), you have to access a file by its exact path.1335 (everything else), you have to access a file by its exact path.
13361336
1337 Internally, bzr only supports NFC normalization, since that is1337 Internally, bzr only supports NFC normalization, since that is
1338 the standard for XML documents.1338 the standard for XML documents.