Rev 4855: Strip trailing whitespace from doc files by Patrick Regan. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-doc-updates

John Arbash Meinel john at arbash-meinel.com
Wed Dec 2 23:09:51 GMT 2009


At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-doc-updates

------------------------------------------------------------
revno: 4855 [merge]
revision-id: john at arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
parent: john at arbash-meinel.com-20091202230411-x7bnbdnrierx2tr4
parent: patrick.rubbs.regan at gmail.com-20091202203407-fjd0mshgn3j3foel
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-doc-updates
timestamp: Wed 2009-12-02 17:09:40 -0600
message:
  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.
modified:
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  doc/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/add.txt         add.txt-20070515094933-xhgz3xjc7o0edok0-2
  doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
  doc/developers/apport.txt      apport.txt-20090812083313-9nz21aq6dtwv7hmm-1
  doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
  doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
  doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
  doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
  doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
  doc/developers/commit.txt      performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
  doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
  doc/developers/content-filtering.txt contentfiltering.txt-20090825034801-16mynkm76jpmi4tp-1
  doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
  doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
  doc/developers/diff.txt        diff.txt-20070716233605-2q6jzorua7mr42jk-1
  doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
  doc/developers/ec2.txt         ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
  doc/developers/improved_chk_index.txt improved_chk_index.t-20090320211430-odgus43a7wgoi0ik-1
  doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
  doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
  doc/developers/last-modified.txt lastmodified.txt-20070806222243-df50y5fi7n85vnob-1
  doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
  doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
  doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
  doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
  doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
  doc/developers/plans.txt       plans.txt-20090907074210-zula633ky077z6vu-8
  doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
  doc/developers/process.txt     process.txt-20090907074210-zula633ky077z6vu-9
  doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
  doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
  doc/developers/revert.txt      revert.txt-20070515111013-grc9hgp21zxqbwbl-1
  doc/developers/specifications.txt specifications.txt-20090907074210-zula633ky077z6vu-10
  doc/developers/status.txt      status.txt-20070702023117-6xss29lx170qndwr-1
  doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
  doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
  doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
  doc/developers/win32_build_setup.txt win32_build_setup.tx-20091104201959-pvlau2f8dndoxjj8-1
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
  doc/en/tutorials/tutorial.txt  tutorial.txt-20050804190939-9dcbba2ef053bc84
  doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
  doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
  doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
  doc/en/user-guide/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-2
  doc/en/user-guide/index.txt    indexfor2x.txt-20090722150335-qt9yh29f930m4v0r-1
  doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
  doc/en/user-guide/plugins.txt  plugins.txt-20060314145616-525099a747f3ffdd
  doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
  doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
  doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
  doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
  doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
  doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
  doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
  doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
  doc/en/user-guide/stacked.txt  stacked.txt-20080711023247-4uh9oovoka0sze8b-1
  doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
  doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
  doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
  doc/es/index.txt               index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
  doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
  doc/es/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-1
  doc/es/user-guide/index.txt    index.txt-20080512005856-hgdxkh9xo58n7zdp-2
  doc/es/user-guide/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
  doc/es/user-guide/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
  doc/index.es.txt               index.es.txt-20090909123806-96yfsgrqwra8cwq7-3
  doc/index.ru.txt               index.ru.txt-20090909123806-96yfsgrqwra8cwq7-4
  doc/ja/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20091029100035-1rni8rgpen0pe1g2-19
  doc/ja/upgrade-guide/data_migration.txt data_migration.txt-20091029100035-1rni8rgpen0pe1g2-20
  doc/ja/user-guide/entering_commands.txt entering_commands.tx-20091029100035-1rni8rgpen0pe1g2-37
  doc/ja/user-guide/http_smart_server.txt http_smart_server.tx-20091029100035-1rni8rgpen0pe1g2-41
  doc/ja/user-guide/introducing_bazaar.txt introducing_bazaar.t-20091029100035-1rni8rgpen0pe1g2-44
  doc/ja/user-guide/setting_up_email.txt setting_up_email.txt-20091029100035-1rni8rgpen0pe1g2-59
  doc/ja/user-guide/version_info.txt version_info.txt-20091029100035-1rni8rgpen0pe1g2-71
  doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
  doc/ru/index.txt               index.ru.txt-20080819091426-kfq61l02dhm9pplk-1
  doc/ru/mini-tutorial/index.txt index.txt-20080818031309-t3nyctvfbvfh4h2u-4
  doc/ru/tutorials/centralized_workflow.txt centralized_workflow-20090531190825-ex3ums4bcuaf2r6k-1
  doc/ru/tutorials/tutorial.txt  tutorial.txt-20090602180629-wkp7wr27jl4i2zep-1
  doc/ru/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20090427084917-b22ppqtdx7q4hapw-1
  doc/ru/user-guide/branching_a_project.txt branching_a_project.-20090602104644-pjpwfx7xh2k5l0ba-1
  doc/ru/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-2
  doc/ru/user-guide/index.txt    index.txt-20090601201124-cruf3mmq5cfxeb1w-2
  doc/ru/user-guide/introducing_bazaar.txt introducing_bazaar.t-20090601221109-6ehwbt2pvzgpftlu-1
  doc/ru/user-guide/specifying_revisions.txt specifying_revisions-20090602104644-pjpwfx7xh2k5l0ba-3
  doc/ru/user-guide/zen.txt      zen.txt-20090602104644-pjpwfx7xh2k5l0ba-6
-------------- next part --------------

Diff too large for email (5652 lines, the limit is 1000).


More information about the bazaar-commits mailing list