Bazaar

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

  1. gnuness
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 5279
Proposed branch: lp:~mbp/bzr/gnuness
Merge into: lp:bzr
Diff against target: 484 lines (+60/-49)
28 files modified
INSTALL (+2/-2)
NEWS (+4/-4)
bzrlib/breakin.py (+1/-1)
bzrlib/builtins.py (+1/-1)
bzrlib/config.py (+0/-1)
bzrlib/doc_generate/autodoc_man.py (+1/-1)
bzrlib/filters/eol.py (+3/-3)
bzrlib/help_topics/__init__.py (+1/-1)
bzrlib/help_topics/en/configuration.txt (+2/-2)
bzrlib/help_topics/en/content-filters.txt (+1/-1)
bzrlib/tests/stub_sftp.py (+2/-2)
bzrlib/tests/test__dirstate_helpers.py (+1/-1)
bzrlib/tests/test_directory_service.py (+1/-1)
bzrlib/urlutils.py (+1/-1)
doc/developers/HACKING.txt (+1/-1)
doc/developers/case-insensitive-file-systems.txt (+2/-2)
doc/developers/code-style.txt (+12/-0)
doc/developers/planned-change-integration.txt (+1/-1)
doc/en/admin-guide/code-browsing.txt (+5/-5)
doc/en/admin-guide/introduction.txt (+2/-2)
doc/en/admin-guide/upgrade.txt (+1/-1)
doc/en/upgrade-guide/overview.txt (+5/-5)
doc/en/user-guide/branching_a_project.txt (+1/-1)
doc/en/user-guide/configuring_bazaar.txt (+1/-1)
doc/en/user-guide/installing_bazaar.txt (+4/-4)
doc/en/user-guide/plugins.txt (+2/-2)
doc/en/user-guide/setting_up_email.txt (+1/-1)
doc/en/user-guide/version_info.txt (+1/-1)
To merge this branch: bzr merge lp:~mbp/bzr/gnuness
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+26559@code.launchpad.net

Commit message

avoid inaccurate use of "linux" or non-gnu-compliant "open source"

Description of the change

https://bugs.edge.launchpad.net/bzr/+bug/528253

This brings our terminology in line with the GNU policy of saying "Linux" to refer to the kernel not the whole OS. Incidentally and complementarily my employer's product is called "Ubuntu" not "Ubuntu Linux".

As it happens, most of the time when we said "linux" in the code itself we actually did mean "the Linux kernel" or we were being overprecise and we meant "Unix generally". In the documentation there were more cases that needed to be corrected.

http://en.wikipedia.org/wiki/GNU/Linux_naming_controversy

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Looks fine to me. Do we need (tm) on Unix ?

-Rob

Revision history for this message
Matthew Fuller (fullermd) wrote :

> Looks fine to me. Do we need (tm) on Unix ?

I often go with '*nix' in such usages, which avoids trademark issues
on the one hand and nicely conveys a general statement about a class
of systems on the other. Whether it fits tonally is another question,
though.

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Matthew D Fuller <email address hidden> writes:

    >> Looks fine to me. Do we need (tm) on Unix ?
    > I often go with '*nix' in such usages, which avoids trademark issues
    > on the one hand and nicely conveys a general statement about a class
    > of systems on the other. Whether it fits tonally is another question,
    > though.

+1 I'd rather go with *nix than adding (TM).

   Vincent

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

On 2 June 2010 15:25, Robert Collins <email address hidden> wrote:
> Looks fine to me. Do we need (tm) on Unix ?

Both Canonical and GNU's policy is not to add them in general. There
is no general legal requirement to acknowledge other peoples'
trademarks.

In short: no.

--
Martin <http://launchpad.net/~mbp/>

Revision history for this message
Alexander Belchenko (bialix) wrote :

fullermd пишет:
>> Looks fine to me. Do we need (tm) on Unix ?
>
> I often go with '*nix' in such usages, which avoids trademark issues
> on the one hand and nicely conveys a general statement about a class
> of systems on the other. Whether it fits tonally is another question,
> though.

Please, don't. Asterisk is used as markup symbol in ReStructuredText. So
using *nix will break our documentation translation.

So, please don't.

-1 -1 -1

--
All the dude wanted was his rug back

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Alexander Belchenko <email address hidden> writes:

    > fullermd пишет:
    >>> Looks fine to me. Do we need (tm) on Unix ?
    >>
    >> I often go with '*nix' in such usages, which avoids trademark issues
    >> on the one hand and nicely conveys a general statement about a class
    >> of systems on the other. Whether it fits tonally is another question,
    >> though.

    > Please, don't. Asterisk is used as markup symbol in ReStructuredText. So
    > using *nix will break our documentation translation.

    > So, please don't.

    > -1 -1 -1

Hmm, thanks for raising the issue, but are you sure ? That will be quite
a bug in the rest parser if an unmatched '*' breaks it...

Not a big problem since Martin said we shouldn't add (TM) anyway...

  Vincent

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 'INSTALL'
--- INSTALL 2010-01-29 10:36:23 +0000
+++ INSTALL 2010-06-02 05:16:27 +0000
@@ -15,10 +15,10 @@
1515
16bzr can optionally use compiled versions of some parts of the code16bzr can optionally use compiled versions of some parts of the code
17for increased speed. When installing bzr you need the ability to17for increased speed. When installing bzr you need the ability to
18build C extensions. Some Linux distributions package the necessary18build C extensions. Some GNU/Linux distributions package the necessary
19headers separately from the main Python package. This package is19headers separately from the main Python package. This package is
20probably named something like python-dev or python-devel. FreeBSD,20probably named something like python-dev or python-devel. FreeBSD,
21Windows, source-based Linux distributions, and possibly other operating21Windows, source-based GNU/Linux distributions, and possibly other operating
22systems, have the required files installed by default.22systems, have the required files installed by default.
2323
24If you are installing bzr from a bzr branch rather than a release tarball,24If you are installing bzr from a bzr branch rather than a release tarball,
2525
=== modified file 'NEWS'
--- NEWS 2010-06-01 14:09:27 +0000
+++ NEWS 2010-06-02 05:16:27 +0000
@@ -3950,8 +3950,8 @@
3950 can have a large effect on ``bzr checkout`` times. (John Arbash Meinel)3950 can have a large effect on ``bzr checkout`` times. (John Arbash Meinel)
39513951
3952* selftest now supports a --parallel option, with values of 'fork' or3952* selftest now supports a --parallel option, with values of 'fork' or
3953 'subprocess' to run the test suite in parallel. Currently only linux3953 'subprocess' to run the test suite in parallel. Currently only Linux
3954 machine work, other platforms need patches submitted. (Robert Collins,3954 machines work, other platforms need patches submitted. (Robert Collins,
3955 Vincent Ladeuil)3955 Vincent Ladeuil)
39563956
3957* ``tests.run_suite`` has a new parameter ``suite_decorators``, a list of 3957* ``tests.run_suite`` has a new parameter ``suite_decorators``, a list of
@@ -6705,7 +6705,7 @@
67056705
6706* bzr main script cannot be imported (Benjamin Peterson)6706* bzr main script cannot be imported (Benjamin Peterson)
67076707
6708* On Linux bzr additionally looks for plugins in arch-independent site6708* On GNU/Linux bzr additionally looks for plugins in arch-independent site
6709 directory. (Toshio Kuratomi)6709 directory. (Toshio Kuratomi)
67106710
6711* The ``set_rh`` branch hook is now deprecated. Please migrate6711* The ``set_rh`` branch hook is now deprecated. Please migrate
@@ -7048,7 +7048,7 @@
70487048
7049* BZR_LOG environment variable controls location of .bzr.log trace file.7049* BZR_LOG environment variable controls location of .bzr.log trace file.
7050 User can suppress writing messages to .bzr.log by using '/dev/null'7050 User can suppress writing messages to .bzr.log by using '/dev/null'
7051 filename (on Linux) or 'NUL' (on Windows). If BZR_LOG variable7051 filename (on Unix) or 'NUL' (on Windows). If BZR_LOG variable
7052 is not defined but BZR_HOME is defined then default location7052 is not defined but BZR_HOME is defined then default location
7053 for .bzr.log trace file is ``$BZR_HOME/.bzr.log``.7053 for .bzr.log trace file is ``$BZR_HOME/.bzr.log``.
7054 (Alexander Belchenko, #106117)7054 (Alexander Belchenko, #106117)
70557055
=== modified file 'bzrlib/breakin.py'
--- bzrlib/breakin.py 2010-02-26 03:00:34 +0000
+++ bzrlib/breakin.py 2010-06-02 05:16:27 +0000
@@ -78,7 +78,7 @@
78def hook_debugger_to_signal():78def hook_debugger_to_signal():
79 """Add a signal handler so we drop into the debugger.79 """Add a signal handler so we drop into the debugger.
8080
81 On Linux and Mac, this is hooked into SIGQUIT (C-\\) on Windows, this is81 On Unix, this is hooked into SIGQUIT (C-\\), and on Windows, this is
82 hooked into SIGBREAK (C-Pause).82 hooked into SIGBREAK (C-Pause).
83 """83 """
8484
8585
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py 2010-05-25 17:27:52 +0000
+++ bzrlib/builtins.py 2010-06-02 05:16:27 +0000
@@ -5128,7 +5128,7 @@
5128 given, in which case it is sent to a file.5128 given, in which case it is sent to a file.
51295129
5130 Mail is sent using your preferred mail program. This should be transparent5130 Mail is sent using your preferred mail program. This should be transparent
5131 on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.5131 on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5132 If the preferred client can't be found (or used), your editor will be used.5132 If the preferred client can't be found (or used), your editor will be used.
51335133
5134 To use a specific mail program, set the mail_client configuration option.5134 To use a specific mail program, set the mail_client configuration option.
51355135
=== modified file 'bzrlib/config.py'
--- bzrlib/config.py 2010-05-25 17:27:52 +0000
+++ bzrlib/config.py 2010-06-02 05:16:27 +0000
@@ -843,7 +843,6 @@
843 ' or HOME set')843 ' or HOME set')
844 return osutils.pathjoin(base, 'bazaar', '2.0')844 return osutils.pathjoin(base, 'bazaar', '2.0')
845 else:845 else:
846 # cygwin, linux, and darwin all have a $HOME directory
847 if base is None:846 if base is None:
848 base = os.path.expanduser("~")847 base = os.path.expanduser("~")
849 return osutils.pathjoin(base, ".bazaar")848 return osutils.pathjoin(base, ".bazaar")
850849
=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- bzrlib/doc_generate/autodoc_man.py 2010-02-23 07:43:11 +0000
+++ bzrlib/doc_generate/autodoc_man.py 2010-06-02 05:16:27 +0000
@@ -186,7 +186,7 @@
186.B "help"186.B "help"
187.I "command"187.I "command"
188.SH "DESCRIPTION"188.SH "DESCRIPTION"
189Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an open source189Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
190distributed version control system that is powerful, friendly, and scalable.190distributed version control system that is powerful, friendly, and scalable.
191Version control means a system that keeps track of previous revisions191Version control means a system that keeps track of previous revisions
192of software source code or similar information and helps people work on it in teams.192of software source code or similar information and helps people work on it in teams.
193193
=== modified file 'bzrlib/filters/eol.py'
--- bzrlib/filters/eol.py 2009-05-07 05:08:46 +0000
+++ bzrlib/filters/eol.py 2010-06-02 05:16:27 +0000
@@ -25,8 +25,8 @@
25from bzrlib.errors import BzrError25from bzrlib.errors import BzrError
2626
2727
28# Real Linux/Unix/OSX newline - \n without \r before it28# Real Unix newline - \n without \r before it
29_LINUX_NL_RE = re.compile(r'(?<!\r)\n')29_UNIX_NL_RE = re.compile(r'(?<!\r)\n')
3030
3131
32def _to_lf_converter(chunks, context=None):32def _to_lf_converter(chunks, context=None):
@@ -44,7 +44,7 @@
44 if '\x00' in content:44 if '\x00' in content:
45 return [content]45 return [content]
46 else:46 else:
47 return [_LINUX_NL_RE.sub('\r\n', content)]47 return [_UNIX_NL_RE.sub('\r\n', content)]
4848
4949
50# Register the eol content filter.50# Register the eol content filter.
5151
=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py 2010-05-20 11:04:58 +0000
+++ bzrlib/help_topics/__init__.py 2010-06-02 05:16:27 +0000
@@ -618,7 +618,7 @@
618_files = \618_files = \
619r"""Files619r"""Files
620620
621:On Linux: ~/.bazaar/bazaar.conf621:On Unix: ~/.bazaar/bazaar.conf
622:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf622:On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
623623
624Contains the user's default configuration. The section ``[DEFAULT]`` is624Contains the user's default configuration. The section ``[DEFAULT]`` is
625625
=== modified file 'bzrlib/help_topics/en/configuration.txt'
--- bzrlib/help_topics/en/configuration.txt 2010-05-04 14:52:33 +0000
+++ bzrlib/help_topics/en/configuration.txt 2010-06-02 05:16:27 +0000
@@ -90,7 +90,7 @@
9090
91As for the ``PATH`` variables, if multiple directories are91As for the ``PATH`` variables, if multiple directories are
92specified in ``BZR_PLUGIN_PATH`` they should be separated by the92specified in ``BZR_PLUGIN_PATH`` they should be separated by the
93platform specific appropriate character (':' on Unix/Linux/etc,93platform specific appropriate character (':' on Unix,
94';' on windows)94';' on windows)
9595
96By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching96By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching
@@ -185,7 +185,7 @@
185Location185Location
186~~~~~~~~186~~~~~~~~
187187
188Configuration files are located in ``$HOME/.bazaar`` on Linux/Unix and188Configuration files are located in ``$HOME/.bazaar`` on Unix and
189``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on189``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
190Windows. (You can check the location for your system by using190Windows. (You can check the location for your system by using
191``bzr version``.)191``bzr version``.)
192192
=== modified file 'bzrlib/help_topics/en/content-filters.txt'
--- bzrlib/help_topics/en/content-filters.txt 2010-01-03 03:33:10 +0000
+++ bzrlib/help_topics/en/content-filters.txt 2010-06-02 05:16:27 +0000
@@ -8,7 +8,7 @@
8format from the copy in your working tree. This lets you, or your8format from the copy in your working tree. This lets you, or your
9co-developers, use Windows development tools that expect CRLF files9co-developers, use Windows development tools that expect CRLF files
10on projects that use other line-ending conventions. Among other things,10on projects that use other line-ending conventions. Among other things,
11content filters also let Linux developers more easily work on projects11content filters also let Unix developers more easily work on projects
12using Windows line-ending conventions, keyword expansion/compression,12using Windows line-ending conventions, keyword expansion/compression,
13and trailing spaces on lines in text files to be implicitly stripped13and trailing spaces on lines in text files to be implicitly stripped
14when committed.14when committed.
1515
=== modified file 'bzrlib/tests/stub_sftp.py'
--- bzrlib/tests/stub_sftp.py 2010-05-14 09:34:16 +0000
+++ bzrlib/tests/stub_sftp.py 2010-06-02 05:16:27 +0000
@@ -135,7 +135,7 @@
135 try:135 try:
136 out = [ ]136 out = [ ]
137 # TODO: win32 incorrectly lists paths with non-ascii if path is not137 # TODO: win32 incorrectly lists paths with non-ascii if path is not
138 # unicode. However on Linux the server should only deal with138 # unicode. However on unix the server should only deal with
139 # bytestreams and posix.listdir does the right thing139 # bytestreams and posix.listdir does the right thing
140 if sys.platform == 'win32':140 if sys.platform == 'win32':
141 flist = [f.encode('utf8') for f in os.listdir(path)]141 flist = [f.encode('utf8') for f in os.listdir(path)]
@@ -452,7 +452,7 @@
452 # Normalize the path or it will be wrongly escaped452 # Normalize the path or it will be wrongly escaped
453 self._homedir = osutils.normpath(self._homedir)453 self._homedir = osutils.normpath(self._homedir)
454 else:454 else:
455 # But Linux SFTP servers should just deal in bytestreams455 # But unix SFTP servers should just deal in bytestreams
456 self._homedir = os.getcwd()456 self._homedir = os.getcwd()
457 if self._server_homedir is None:457 if self._server_homedir is None:
458 self._server_homedir = self._homedir458 self._server_homedir = self._homedir
459459
=== modified file 'bzrlib/tests/test__dirstate_helpers.py'
--- bzrlib/tests/test__dirstate_helpers.py 2010-02-23 07:43:11 +0000
+++ bzrlib/tests/test__dirstate_helpers.py 2010-06-02 05:16:27 +0000
@@ -737,7 +737,7 @@
737737
738 def test_trailing_garbage(self):738 def test_trailing_garbage(self):
739 tree, state, expected = self.create_basic_dirstate()739 tree, state, expected = self.create_basic_dirstate()
740 # On Linux, we can write extra data as long as we haven't read yet, but740 # On Unix, we can write extra data as long as we haven't read yet, but
741 # on Win32, if you've opened the file with FILE_SHARE_READ, trying to741 # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
742 # open it in append mode will fail.742 # open it in append mode will fail.
743 state.unlock()743 state.unlock()
744744
=== modified file 'bzrlib/tests/test_directory_service.py'
--- bzrlib/tests/test_directory_service.py 2010-02-23 07:43:11 +0000
+++ bzrlib/tests/test_directory_service.py 2010-06-02 05:16:27 +0000
@@ -28,7 +28,7 @@
28class FooService(object):28class FooService(object):
29 """A directory service that maps the name to a FILE url"""29 """A directory service that maps the name to a FILE url"""
3030
31 # eg 'file:///foo' on Linux, or 'file:///C:/foo' on Windows31 # eg 'file:///foo' on Unix, or 'file:///C:/foo' on Windows
32 base = urlutils.local_path_to_url('/foo')32 base = urlutils.local_path_to_url('/foo')
3333
34 def look_up(self, name, url):34 def look_up(self, name, url):
3535
=== modified file 'bzrlib/urlutils.py'
--- bzrlib/urlutils.py 2010-05-27 22:10:42 +0000
+++ bzrlib/urlutils.py 2010-06-02 05:16:27 +0000
@@ -278,7 +278,7 @@
278 # on non-win32 platform278 # on non-win32 platform
279 # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname279 # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
280 # which actually strips trailing space characters.280 # which actually strips trailing space characters.
281 # The worst part is that under linux ntpath.abspath has different281 # The worst part is that on linux ntpath.abspath has different
282 # semantics, since 'nt' is not an available module.282 # semantics, since 'nt' is not an available module.
283 if path == '/':283 if path == '/':
284 return 'file:///'284 return 'file:///'
285285
=== modified file 'doc/developers/HACKING.txt'
--- doc/developers/HACKING.txt 2010-05-27 04:55:13 +0000
+++ doc/developers/HACKING.txt 2010-06-02 05:16:27 +0000
@@ -869,7 +869,7 @@
869energy by emailing the **bazaar-commits** list implicitly. To do this,869energy by emailing the **bazaar-commits** list implicitly. To do this,
870install and configure the Email plugin. One way to do this is add these870install and configure the Email plugin. One way to do this is add these
871configuration settings to your central configuration file (e.g.871configuration settings to your central configuration file (e.g.
872``~/.bazaar/bazaar.conf`` on Linux)::872``~/.bazaar/bazaar.conf``)::
873873
874 [DEFAULT]874 [DEFAULT]
875 email = Joe Smith <joe.smith@internode.on.net>875 email = Joe Smith <joe.smith@internode.on.net>
876876
=== modified file 'doc/developers/case-insensitive-file-systems.txt'
--- doc/developers/case-insensitive-file-systems.txt 2009-12-02 20:34:07 +0000
+++ doc/developers/case-insensitive-file-systems.txt 2010-06-02 05:16:27 +0000
@@ -9,13 +9,13 @@
9For example, the FAT32 file-system is most commonly found on Windows operating9For example, the FAT32 file-system is most commonly found on Windows operating
10systems, and has the characteristics usually associated with a Windows10systems, and has the characteristics usually associated with a Windows
11file-system. However, USB devices means FAT32 file-systems are often used11file-system. However, USB devices means FAT32 file-systems are often used
12with Linux, so the current operating system doesn't necessarily reflect the12with GNU/Linux systems, so the current operating system doesn't necessarily reflect the
13capabilities of the file-system.13capabilities of the file-system.
1414
15Bazaar supports 3 kinds of file-systems, each to different degrees.15Bazaar supports 3 kinds of file-systems, each to different degrees.
1616
17* Case-sensitive file-systems: This is the file-system generally used on17* Case-sensitive file-systems: This is the file-system generally used on
18 Linux - 2 files can differ only by case, and the exact case must be used18 GNU/Linux: 2 files can differ only by case, and the exact case must be used
19 when opening a file.19 when opening a file.
2020
21* Case-insensitive, case-preserving (cicp) file-systems: This is the21* Case-insensitive, case-preserving (cicp) file-systems: This is the
2222
=== modified file 'doc/developers/code-style.txt'
--- doc/developers/code-style.txt 2010-06-01 07:07:39 +0000
+++ doc/developers/code-style.txt 2010-06-02 05:16:27 +0000
@@ -441,5 +441,17 @@
441 finally:441 finally:
442 f.close()442 f.close()
443443
444
445Terminology
446===========
447
448Bazaar is a GNU project and uses standard GNU terminology, especially:
449
450 * Use the word "Linux" to refer to the Linux kernel, not as a synechoche
451 for the entire operating system. (See `bug 528253
452 <https://bugs.launchpad.net/bzr/+bug/528253>`_).
453
454 * Don't say "open source" when you mean "free software".
455
444..456..
445 vim: ft=rst tw=74 ai457 vim: ft=rst tw=74 ai
446458
=== modified file 'doc/developers/planned-change-integration.txt'
--- doc/developers/planned-change-integration.txt 2009-12-02 20:34:07 +0000
+++ doc/developers/planned-change-integration.txt 2010-06-02 05:16:27 +0000
@@ -73,7 +73,7 @@
73 * Working tree disk ordering: Knowing the expected order for disk operations73 * Working tree disk ordering: Knowing the expected order for disk operations
74 may influence the needed use case specific APIs, so having a solid74 may influence the needed use case specific APIs, so having a solid
75 understanding of what is optimal - and why - and whether it is pessimal on75 understanding of what is optimal - and why - and whether it is pessimal on
76 non linux platforms is rather important.76 non-Linux-kernel platforms is rather important.
7777
78 * Be able to version files greater than memory in size: This cannot be78 * Be able to version files greater than memory in size: This cannot be
79 achieved until all parts of the library which deal with user files are able79 achieved until all parts of the library which deal with user files are able
8080
=== modified file 'doc/en/admin-guide/code-browsing.txt'
--- doc/en/admin-guide/code-browsing.txt 2009-12-11 00:00:04 +0000
+++ doc/en/admin-guide/code-browsing.txt 2010-06-02 05:16:27 +0000
@@ -47,8 +47,8 @@
47 On Ubuntu, `sudo apt-get install python-flup`47 On Ubuntu, `sudo apt-get install python-flup`
48 or use `easy_install flup`48 or use `easy_install flup`
4949
50Although directions for installing these on Ubuntu Linux are given, most other50Although directions for installing these on Ubuntu are given, most other
51Linux distributions should package these dependencies, making installation51GNU/Linux distributions should package these dependencies, making installation
52easy. For Windows and Mac OS X, they should all be ``easy_install``-able or at52easy. For Windows and Mac OS X, they should all be ``easy_install``-able or at
53worst installable from the Python sources.53worst installable from the Python sources.
5454
@@ -101,9 +101,9 @@
101This would allow the trunk branch of ProjectX to be browsed at101This would allow the trunk branch of ProjectX to be browsed at
102``http://www.example.com/loggerhead/projectx/trunk``.102``http://www.example.com/loggerhead/projectx/trunk``.
103103
104Loggerhead comes with a script allowing it to run as a service on init.d based104Loggerhead comes with a script allowing it to run as a service on
105Linux systems. Contributions to do a similar thing on Windows servers would105``init.d`` based Unix systems. Contributions to do a similar thing on
106be welcomed at http://launchpad.net/loggerhead.106Windows servers would be welcomed at http://launchpad.net/loggerhead.
107 107
108108
109Other web interfaces109Other web interfaces
110110
=== modified file 'doc/en/admin-guide/introduction.txt'
--- doc/en/admin-guide/introduction.txt 2009-12-07 21:51:01 +0000
+++ doc/en/admin-guide/introduction.txt 2010-06-02 05:16:27 +0000
@@ -27,7 +27,7 @@
27What you need to run a Bazaar server27What you need to run a Bazaar server
28------------------------------------28------------------------------------
2929
30Where possible, we will discuss both Unix (including Linux) and Windows server30Where possible, we will discuss both Unix (including GNU/Linux) and Windows server
31environments. For the purposes of this document, we will consider Mac OS X as31environments. For the purposes of this document, we will consider Mac OS X as
32a type of Unix.32a type of Unix.
3333
@@ -44,7 +44,7 @@
44critical components of the code. Pure Python alternatives exist for all of44critical components of the code. Pure Python alternatives exist for all of
45these components, but they may be considerably slower. To compile these45these components, but they may be considerably slower. To compile these
46extensions, you need a C compiler and the relevant header files from the46extensions, you need a C compiler and the relevant header files from the
47Python package. On Linux, these may be in a separate package. Other47Python package. On GNU/Linux, these may be in a separate package. Other
48operating systems should have the required headers installed by default.48operating systems should have the required headers installed by default.
4949
50If you are installing a development version of Bazaar, rather than a released50If you are installing a development version of Bazaar, rather than a released
5151
=== modified file 'doc/en/admin-guide/upgrade.txt'
--- doc/en/admin-guide/upgrade.txt 2009-12-18 10:09:49 +0000
+++ doc/en/admin-guide/upgrade.txt 2010-06-02 05:16:27 +0000
@@ -28,7 +28,7 @@
2828
29Upgrading the Bazaar software is as simple as re-installing the Python package29Upgrading the Bazaar software is as simple as re-installing the Python package
30using either the latest binary package for Windows or Mac OS X, the binary30using either the latest binary package for Windows or Mac OS X, the binary
31package provided by your Linux distribution, or installing from the source31package provided by your GNU/Linux distribution, or installing from the source
32release. See http://bazaar-vcs.org/Downloads for the latest releases for all32release. See http://bazaar-vcs.org/Downloads for the latest releases for all
33supported platforms.33supported platforms.
3434
3535
=== modified file 'doc/en/upgrade-guide/overview.txt'
--- doc/en/upgrade-guide/overview.txt 2009-07-13 06:58:49 +0000
+++ doc/en/upgrade-guide/overview.txt 2010-06-02 05:16:27 +0000
@@ -36,7 +36,7 @@
36to Bazaar 1.y. In either case, a brief outline of the steps is given36to Bazaar 1.y. In either case, a brief outline of the steps is given
37below.37below.
3838
39To upgrade Bazaar on Linux:39To upgrade Bazaar on Ubuntu:
4040
411. Ensure your package manager is configured with the required411. Ensure your package manager is configured with the required
42 software sources, e.g. the official release PPA for Ubuntu:42 software sources, e.g. the official release PPA for Ubuntu:
@@ -72,10 +72,10 @@
72bzr-svn, are more tightly associated with Bazaar's APIs so these72bzr-svn, are more tightly associated with Bazaar's APIs so these
73typically need to be upgraded in lockstep with the core software.73typically need to be upgraded in lockstep with the core software.
7474
75For Windows and OS X users, bzrtools and bzr-svn are typically75For Windows and OS X users, bzrtools and bzr-svn are typically included in
76included in the installer so no special steps are required to upgrade76the installer so no special steps are required to upgrade these. For
77these. For Linux and UNIX users, bztrools, bzr-svn and many other77Ubuntu and other GNU/Linux or Unix systems users, bztrools, bzr-svn and
78popular plugins can be installed and upgraded using your78many other popular plugins can be installed and upgraded using your
79platform's package manager, e.g. Synaptic on Ubuntu.79platform's package manager, e.g. Synaptic on Ubuntu.
8080
8181
8282
=== modified file 'doc/en/user-guide/branching_a_project.txt'
--- doc/en/user-guide/branching_a_project.txt 2010-03-22 00:29:50 +0000
+++ doc/en/user-guide/branching_a_project.txt 2010-06-02 05:16:27 +0000
@@ -8,7 +8,7 @@
8agree on a transfer technology.8agree on a transfer technology.
9You may decide to make the top level directory of your branch9You may decide to make the top level directory of your branch
10a network share, an approach familiar to Windows users.10a network share, an approach familiar to Windows users.
11Linux and OS X users might prefer access to be11Unix users might prefer access to be
12via SFTP, a secure protocol built-in to most SSH servers.12via SFTP, a secure protocol built-in to most SSH servers.
13Bazaar is *very* flexible in this regard with support for13Bazaar is *very* flexible in this regard with support for
14lots of protocols some of which are given below.14lots of protocols some of which are given below.
1515
=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
--- doc/en/user-guide/configuring_bazaar.txt 2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/configuring_bazaar.txt 2010-06-02 05:16:27 +0000
@@ -19,7 +19,7 @@
19Configuration files19Configuration files
20-------------------20-------------------
2121
22Configuration files are located in ``$HOME/.bazaar`` on Linux/Unix and22Configuration files are located in ``$HOME/.bazaar`` on Unix and
23``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on23``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
24Windows. There are three primary configuration files in this location:24Windows. There are three primary configuration files in this location:
2525
2626
=== modified file 'doc/en/user-guide/installing_bazaar.txt'
--- doc/en/user-guide/installing_bazaar.txt 2009-09-09 15:08:17 +0000
+++ doc/en/user-guide/installing_bazaar.txt 2010-06-02 05:16:27 +0000
@@ -1,11 +1,11 @@
1Installing Bazaar1Installing Bazaar
2=================2=================
33
4Linux4GNU/Linux
5-----5---------
66
7Bazaar packages are available for most popular Linux distributions7Bazaar packages are available for most popular GNU/Linux distributions
8including Ubuntu/Debian, Red Hat and Gentoo.8including Ubuntu, Debian, Red Hat and Gentoo.
9See http://bazaar-vcs.org/Download for the latest instructions.9See http://bazaar-vcs.org/Download for the latest instructions.
1010
11Windows11Windows
1212
=== modified file 'doc/en/user-guide/plugins.txt'
--- doc/en/user-guide/plugins.txt 2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/plugins.txt 2010-06-02 05:16:27 +0000
@@ -35,13 +35,13 @@
3535
36Installing a plugin is very easy! If not already created, create a36Installing a plugin is very easy! If not already created, create a
37``plugins`` directory under your Bazaar configuration directory,37``plugins`` directory under your Bazaar configuration directory,
38``~/.bazaar/`` on Linux and38``~/.bazaar/`` on Unix and
39``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\``39``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\``
40on Windows. Within this directory (referred to as $BZR_HOME below),40on Windows. Within this directory (referred to as $BZR_HOME below),
41each plugin is placed in its own subdirectory.41each plugin is placed in its own subdirectory.
4242
43Plugins work particularly well with Bazaar branches. For example, to43Plugins work particularly well with Bazaar branches. For example, to
44install the bzrtools plugins for your main user account on Linux,44install the bzrtools plugins for your main user account on GNU/Linux,
45one can perform the following::45one can perform the following::
4646
47 bzr branch http://panoramicfeedback.com/opensource/bzr/bzrtools47 bzr branch http://panoramicfeedback.com/opensource/bzr/bzrtools
4848
=== modified file 'doc/en/user-guide/setting_up_email.txt'
--- doc/en/user-guide/setting_up_email.txt 2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/setting_up_email.txt 2010-06-02 05:16:27 +0000
@@ -62,7 +62,7 @@
62--------------------------------------------62--------------------------------------------
6363
64To use the default ini file, create or edit the ``bazaar.conf`` file (in64To use the default ini file, create or edit the ``bazaar.conf`` file (in
65``~/.bazaar/`` on Linux and in ``%APPDATA%\bazaar\2.0\`` in Windows)65``~/.bazaar/`` on Unix and in ``%APPDATA%\bazaar\2.0\`` in Windows)
66and set an email address as shown below. Please note that the word DEFAULT66and set an email address as shown below. Please note that the word DEFAULT
67is case sensitive, and must be in upper-case.67is case sensitive, and must be in upper-case.
68::68::
6969
=== modified file 'doc/en/user-guide/version_info.txt'
--- doc/en/user-guide/version_info.txt 2009-12-02 20:34:07 +0000
+++ doc/en/user-guide/version_info.txt 2010-06-02 05:16:27 +0000
@@ -25,7 +25,7 @@
25 branch-nick: bzr.dev25 branch-nick: bzr.dev
2626
27You can easily filter that output using operating system tools or27You can easily filter that output using operating system tools or
28scripts. For example (on Linux/Unix)::28scripts. For example::
2929
30 $ bzr version-info | grep ^date30 $ bzr version-info | grep ^date
31 date: 2007-12-11 17:51:18 +000031 date: 2007-12-11 17:51:18 +0000