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
1=== modified file 'INSTALL'
2--- INSTALL 2010-01-29 10:36:23 +0000
3+++ INSTALL 2010-06-02 05:16:27 +0000
4@@ -15,10 +15,10 @@
5
6 bzr can optionally use compiled versions of some parts of the code
7 for increased speed. When installing bzr you need the ability to
8-build C extensions. Some Linux distributions package the necessary
9+build C extensions. Some GNU/Linux distributions package the necessary
10 headers separately from the main Python package. This package is
11 probably named something like python-dev or python-devel. FreeBSD,
12-Windows, source-based Linux distributions, and possibly other operating
13+Windows, source-based GNU/Linux distributions, and possibly other operating
14 systems, have the required files installed by default.
15
16 If you are installing bzr from a bzr branch rather than a release tarball,
17
18=== modified file 'NEWS'
19--- NEWS 2010-06-01 14:09:27 +0000
20+++ NEWS 2010-06-02 05:16:27 +0000
21@@ -3950,8 +3950,8 @@
22 can have a large effect on ``bzr checkout`` times. (John Arbash Meinel)
23
24 * selftest now supports a --parallel option, with values of 'fork' or
25- 'subprocess' to run the test suite in parallel. Currently only linux
26- machine work, other platforms need patches submitted. (Robert Collins,
27+ 'subprocess' to run the test suite in parallel. Currently only Linux
28+ machines work, other platforms need patches submitted. (Robert Collins,
29 Vincent Ladeuil)
30
31 * ``tests.run_suite`` has a new parameter ``suite_decorators``, a list of
32@@ -6705,7 +6705,7 @@
33
34 * bzr main script cannot be imported (Benjamin Peterson)
35
36-* On Linux bzr additionally looks for plugins in arch-independent site
37+* On GNU/Linux bzr additionally looks for plugins in arch-independent site
38 directory. (Toshio Kuratomi)
39
40 * The ``set_rh`` branch hook is now deprecated. Please migrate
41@@ -7048,7 +7048,7 @@
42
43 * BZR_LOG environment variable controls location of .bzr.log trace file.
44 User can suppress writing messages to .bzr.log by using '/dev/null'
45- filename (on Linux) or 'NUL' (on Windows). If BZR_LOG variable
46+ filename (on Unix) or 'NUL' (on Windows). If BZR_LOG variable
47 is not defined but BZR_HOME is defined then default location
48 for .bzr.log trace file is ``$BZR_HOME/.bzr.log``.
49 (Alexander Belchenko, #106117)
50
51=== modified file 'bzrlib/breakin.py'
52--- bzrlib/breakin.py 2010-02-26 03:00:34 +0000
53+++ bzrlib/breakin.py 2010-06-02 05:16:27 +0000
54@@ -78,7 +78,7 @@
55 def hook_debugger_to_signal():
56 """Add a signal handler so we drop into the debugger.
57
58- On Linux and Mac, this is hooked into SIGQUIT (C-\\) on Windows, this is
59+ On Unix, this is hooked into SIGQUIT (C-\\), and on Windows, this is
60 hooked into SIGBREAK (C-Pause).
61 """
62
63
64=== modified file 'bzrlib/builtins.py'
65--- bzrlib/builtins.py 2010-05-25 17:27:52 +0000
66+++ bzrlib/builtins.py 2010-06-02 05:16:27 +0000
67@@ -5128,7 +5128,7 @@
68 given, in which case it is sent to a file.
69
70 Mail is sent using your preferred mail program. This should be transparent
71- on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
72+ on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
73 If the preferred client can't be found (or used), your editor will be used.
74
75 To use a specific mail program, set the mail_client configuration option.
76
77=== modified file 'bzrlib/config.py'
78--- bzrlib/config.py 2010-05-25 17:27:52 +0000
79+++ bzrlib/config.py 2010-06-02 05:16:27 +0000
80@@ -843,7 +843,6 @@
81 ' or HOME set')
82 return osutils.pathjoin(base, 'bazaar', '2.0')
83 else:
84- # cygwin, linux, and darwin all have a $HOME directory
85 if base is None:
86 base = os.path.expanduser("~")
87 return osutils.pathjoin(base, ".bazaar")
88
89=== modified file 'bzrlib/doc_generate/autodoc_man.py'
90--- bzrlib/doc_generate/autodoc_man.py 2010-02-23 07:43:11 +0000
91+++ bzrlib/doc_generate/autodoc_man.py 2010-06-02 05:16:27 +0000
92@@ -186,7 +186,7 @@
93 .B "help"
94 .I "command"
95 .SH "DESCRIPTION"
96-Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an open source
97+Bazaar (or %(bzrcmd)s) is a project of Canonical to develop an free
98 distributed version control system that is powerful, friendly, and scalable.
99 Version control means a system that keeps track of previous revisions
100 of software source code or similar information and helps people work on it in teams.
101
102=== modified file 'bzrlib/filters/eol.py'
103--- bzrlib/filters/eol.py 2009-05-07 05:08:46 +0000
104+++ bzrlib/filters/eol.py 2010-06-02 05:16:27 +0000
105@@ -25,8 +25,8 @@
106 from bzrlib.errors import BzrError
107
108
109-# Real Linux/Unix/OSX newline - \n without \r before it
110-_LINUX_NL_RE = re.compile(r'(?<!\r)\n')
111+# Real Unix newline - \n without \r before it
112+_UNIX_NL_RE = re.compile(r'(?<!\r)\n')
113
114
115 def _to_lf_converter(chunks, context=None):
116@@ -44,7 +44,7 @@
117 if '\x00' in content:
118 return [content]
119 else:
120- return [_LINUX_NL_RE.sub('\r\n', content)]
121+ return [_UNIX_NL_RE.sub('\r\n', content)]
122
123
124 # Register the eol content filter.
125
126=== modified file 'bzrlib/help_topics/__init__.py'
127--- bzrlib/help_topics/__init__.py 2010-05-20 11:04:58 +0000
128+++ bzrlib/help_topics/__init__.py 2010-06-02 05:16:27 +0000
129@@ -618,7 +618,7 @@
130 _files = \
131 r"""Files
132
133-:On Linux: ~/.bazaar/bazaar.conf
134+:On Unix: ~/.bazaar/bazaar.conf
135 :On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf
136
137 Contains the user's default configuration. The section ``[DEFAULT]`` is
138
139=== modified file 'bzrlib/help_topics/en/configuration.txt'
140--- bzrlib/help_topics/en/configuration.txt 2010-05-04 14:52:33 +0000
141+++ bzrlib/help_topics/en/configuration.txt 2010-06-02 05:16:27 +0000
142@@ -90,7 +90,7 @@
143
144 As for the ``PATH`` variables, if multiple directories are
145 specified in ``BZR_PLUGIN_PATH`` they should be separated by the
146-platform specific appropriate character (':' on Unix/Linux/etc,
147+platform specific appropriate character (':' on Unix,
148 ';' on windows)
149
150 By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching
151@@ -185,7 +185,7 @@
152 Location
153 ~~~~~~~~
154
155-Configuration files are located in ``$HOME/.bazaar`` on Linux/Unix and
156+Configuration files are located in ``$HOME/.bazaar`` on Unix and
157 ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
158 Windows. (You can check the location for your system by using
159 ``bzr version``.)
160
161=== modified file 'bzrlib/help_topics/en/content-filters.txt'
162--- bzrlib/help_topics/en/content-filters.txt 2010-01-03 03:33:10 +0000
163+++ bzrlib/help_topics/en/content-filters.txt 2010-06-02 05:16:27 +0000
164@@ -8,7 +8,7 @@
165 format from the copy in your working tree. This lets you, or your
166 co-developers, use Windows development tools that expect CRLF files
167 on projects that use other line-ending conventions. Among other things,
168-content filters also let Linux developers more easily work on projects
169+content filters also let Unix developers more easily work on projects
170 using Windows line-ending conventions, keyword expansion/compression,
171 and trailing spaces on lines in text files to be implicitly stripped
172 when committed.
173
174=== modified file 'bzrlib/tests/stub_sftp.py'
175--- bzrlib/tests/stub_sftp.py 2010-05-14 09:34:16 +0000
176+++ bzrlib/tests/stub_sftp.py 2010-06-02 05:16:27 +0000
177@@ -135,7 +135,7 @@
178 try:
179 out = [ ]
180 # TODO: win32 incorrectly lists paths with non-ascii if path is not
181- # unicode. However on Linux the server should only deal with
182+ # unicode. However on unix the server should only deal with
183 # bytestreams and posix.listdir does the right thing
184 if sys.platform == 'win32':
185 flist = [f.encode('utf8') for f in os.listdir(path)]
186@@ -452,7 +452,7 @@
187 # Normalize the path or it will be wrongly escaped
188 self._homedir = osutils.normpath(self._homedir)
189 else:
190- # But Linux SFTP servers should just deal in bytestreams
191+ # But unix SFTP servers should just deal in bytestreams
192 self._homedir = os.getcwd()
193 if self._server_homedir is None:
194 self._server_homedir = self._homedir
195
196=== modified file 'bzrlib/tests/test__dirstate_helpers.py'
197--- bzrlib/tests/test__dirstate_helpers.py 2010-02-23 07:43:11 +0000
198+++ bzrlib/tests/test__dirstate_helpers.py 2010-06-02 05:16:27 +0000
199@@ -737,7 +737,7 @@
200
201 def test_trailing_garbage(self):
202 tree, state, expected = self.create_basic_dirstate()
203- # On Linux, we can write extra data as long as we haven't read yet, but
204+ # On Unix, we can write extra data as long as we haven't read yet, but
205 # on Win32, if you've opened the file with FILE_SHARE_READ, trying to
206 # open it in append mode will fail.
207 state.unlock()
208
209=== modified file 'bzrlib/tests/test_directory_service.py'
210--- bzrlib/tests/test_directory_service.py 2010-02-23 07:43:11 +0000
211+++ bzrlib/tests/test_directory_service.py 2010-06-02 05:16:27 +0000
212@@ -28,7 +28,7 @@
213 class FooService(object):
214 """A directory service that maps the name to a FILE url"""
215
216- # eg 'file:///foo' on Linux, or 'file:///C:/foo' on Windows
217+ # eg 'file:///foo' on Unix, or 'file:///C:/foo' on Windows
218 base = urlutils.local_path_to_url('/foo')
219
220 def look_up(self, name, url):
221
222=== modified file 'bzrlib/urlutils.py'
223--- bzrlib/urlutils.py 2010-05-27 22:10:42 +0000
224+++ bzrlib/urlutils.py 2010-06-02 05:16:27 +0000
225@@ -278,7 +278,7 @@
226 # on non-win32 platform
227 # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
228 # which actually strips trailing space characters.
229- # The worst part is that under linux ntpath.abspath has different
230+ # The worst part is that on linux ntpath.abspath has different
231 # semantics, since 'nt' is not an available module.
232 if path == '/':
233 return 'file:///'
234
235=== modified file 'doc/developers/HACKING.txt'
236--- doc/developers/HACKING.txt 2010-05-27 04:55:13 +0000
237+++ doc/developers/HACKING.txt 2010-06-02 05:16:27 +0000
238@@ -869,7 +869,7 @@
239 energy by emailing the **bazaar-commits** list implicitly. To do this,
240 install and configure the Email plugin. One way to do this is add these
241 configuration settings to your central configuration file (e.g.
242-``~/.bazaar/bazaar.conf`` on Linux)::
243+``~/.bazaar/bazaar.conf``)::
244
245 [DEFAULT]
246 email = Joe Smith <joe.smith@internode.on.net>
247
248=== modified file 'doc/developers/case-insensitive-file-systems.txt'
249--- doc/developers/case-insensitive-file-systems.txt 2009-12-02 20:34:07 +0000
250+++ doc/developers/case-insensitive-file-systems.txt 2010-06-02 05:16:27 +0000
251@@ -9,13 +9,13 @@
252 For example, the FAT32 file-system is most commonly found on Windows operating
253 systems, and has the characteristics usually associated with a Windows
254 file-system. However, USB devices means FAT32 file-systems are often used
255-with Linux, so the current operating system doesn't necessarily reflect the
256+with GNU/Linux systems, so the current operating system doesn't necessarily reflect the
257 capabilities of the file-system.
258
259 Bazaar supports 3 kinds of file-systems, each to different degrees.
260
261 * Case-sensitive file-systems: This is the file-system generally used on
262- Linux - 2 files can differ only by case, and the exact case must be used
263+ GNU/Linux: 2 files can differ only by case, and the exact case must be used
264 when opening a file.
265
266 * Case-insensitive, case-preserving (cicp) file-systems: This is the
267
268=== modified file 'doc/developers/code-style.txt'
269--- doc/developers/code-style.txt 2010-06-01 07:07:39 +0000
270+++ doc/developers/code-style.txt 2010-06-02 05:16:27 +0000
271@@ -441,5 +441,17 @@
272 finally:
273 f.close()
274
275+
276+Terminology
277+===========
278+
279+Bazaar is a GNU project and uses standard GNU terminology, especially:
280+
281+ * Use the word "Linux" to refer to the Linux kernel, not as a synechoche
282+ for the entire operating system. (See `bug 528253
283+ <https://bugs.launchpad.net/bzr/+bug/528253>`_).
284+
285+ * Don't say "open source" when you mean "free software".
286+
287 ..
288 vim: ft=rst tw=74 ai
289
290=== modified file 'doc/developers/planned-change-integration.txt'
291--- doc/developers/planned-change-integration.txt 2009-12-02 20:34:07 +0000
292+++ doc/developers/planned-change-integration.txt 2010-06-02 05:16:27 +0000
293@@ -73,7 +73,7 @@
294 * Working tree disk ordering: Knowing the expected order for disk operations
295 may influence the needed use case specific APIs, so having a solid
296 understanding of what is optimal - and why - and whether it is pessimal on
297- non linux platforms is rather important.
298+ non-Linux-kernel platforms is rather important.
299
300 * Be able to version files greater than memory in size: This cannot be
301 achieved until all parts of the library which deal with user files are able
302
303=== modified file 'doc/en/admin-guide/code-browsing.txt'
304--- doc/en/admin-guide/code-browsing.txt 2009-12-11 00:00:04 +0000
305+++ doc/en/admin-guide/code-browsing.txt 2010-06-02 05:16:27 +0000
306@@ -47,8 +47,8 @@
307 On Ubuntu, `sudo apt-get install python-flup`
308 or use `easy_install flup`
309
310-Although directions for installing these on Ubuntu Linux are given, most other
311-Linux distributions should package these dependencies, making installation
312+Although directions for installing these on Ubuntu are given, most other
313+GNU/Linux distributions should package these dependencies, making installation
314 easy. For Windows and Mac OS X, they should all be ``easy_install``-able or at
315 worst installable from the Python sources.
316
317@@ -101,9 +101,9 @@
318 This would allow the trunk branch of ProjectX to be browsed at
319 ``http://www.example.com/loggerhead/projectx/trunk``.
320
321-Loggerhead comes with a script allowing it to run as a service on init.d based
322-Linux systems. Contributions to do a similar thing on Windows servers would
323-be welcomed at http://launchpad.net/loggerhead.
324+Loggerhead comes with a script allowing it to run as a service on
325+``init.d`` based Unix systems. Contributions to do a similar thing on
326+Windows servers would be welcomed at http://launchpad.net/loggerhead.
327
328
329 Other web interfaces
330
331=== modified file 'doc/en/admin-guide/introduction.txt'
332--- doc/en/admin-guide/introduction.txt 2009-12-07 21:51:01 +0000
333+++ doc/en/admin-guide/introduction.txt 2010-06-02 05:16:27 +0000
334@@ -27,7 +27,7 @@
335 What you need to run a Bazaar server
336 ------------------------------------
337
338-Where possible, we will discuss both Unix (including Linux) and Windows server
339+Where possible, we will discuss both Unix (including GNU/Linux) and Windows server
340 environments. For the purposes of this document, we will consider Mac OS X as
341 a type of Unix.
342
343@@ -44,7 +44,7 @@
344 critical components of the code. Pure Python alternatives exist for all of
345 these components, but they may be considerably slower. To compile these
346 extensions, you need a C compiler and the relevant header files from the
347-Python package. On Linux, these may be in a separate package. Other
348+Python package. On GNU/Linux, these may be in a separate package. Other
349 operating systems should have the required headers installed by default.
350
351 If you are installing a development version of Bazaar, rather than a released
352
353=== modified file 'doc/en/admin-guide/upgrade.txt'
354--- doc/en/admin-guide/upgrade.txt 2009-12-18 10:09:49 +0000
355+++ doc/en/admin-guide/upgrade.txt 2010-06-02 05:16:27 +0000
356@@ -28,7 +28,7 @@
357
358 Upgrading the Bazaar software is as simple as re-installing the Python package
359 using either the latest binary package for Windows or Mac OS X, the binary
360-package provided by your Linux distribution, or installing from the source
361+package provided by your GNU/Linux distribution, or installing from the source
362 release. See http://bazaar-vcs.org/Downloads for the latest releases for all
363 supported platforms.
364
365
366=== modified file 'doc/en/upgrade-guide/overview.txt'
367--- doc/en/upgrade-guide/overview.txt 2009-07-13 06:58:49 +0000
368+++ doc/en/upgrade-guide/overview.txt 2010-06-02 05:16:27 +0000
369@@ -36,7 +36,7 @@
370 to Bazaar 1.y. In either case, a brief outline of the steps is given
371 below.
372
373-To upgrade Bazaar on Linux:
374+To upgrade Bazaar on Ubuntu:
375
376 1. Ensure your package manager is configured with the required
377 software sources, e.g. the official release PPA for Ubuntu:
378@@ -72,10 +72,10 @@
379 bzr-svn, are more tightly associated with Bazaar's APIs so these
380 typically need to be upgraded in lockstep with the core software.
381
382-For Windows and OS X users, bzrtools and bzr-svn are typically
383-included in the installer so no special steps are required to upgrade
384-these. For Linux and UNIX users, bztrools, bzr-svn and many other
385-popular plugins can be installed and upgraded using your
386+For Windows and OS X users, bzrtools and bzr-svn are typically included in
387+the installer so no special steps are required to upgrade these. For
388+Ubuntu and other GNU/Linux or Unix systems users, bztrools, bzr-svn and
389+many other popular plugins can be installed and upgraded using your
390 platform's package manager, e.g. Synaptic on Ubuntu.
391
392
393
394=== modified file 'doc/en/user-guide/branching_a_project.txt'
395--- doc/en/user-guide/branching_a_project.txt 2010-03-22 00:29:50 +0000
396+++ doc/en/user-guide/branching_a_project.txt 2010-06-02 05:16:27 +0000
397@@ -8,7 +8,7 @@
398 agree on a transfer technology.
399 You may decide to make the top level directory of your branch
400 a network share, an approach familiar to Windows users.
401-Linux and OS X users might prefer access to be
402+Unix users might prefer access to be
403 via SFTP, a secure protocol built-in to most SSH servers.
404 Bazaar is *very* flexible in this regard with support for
405 lots of protocols some of which are given below.
406
407=== modified file 'doc/en/user-guide/configuring_bazaar.txt'
408--- doc/en/user-guide/configuring_bazaar.txt 2009-12-02 20:34:07 +0000
409+++ doc/en/user-guide/configuring_bazaar.txt 2010-06-02 05:16:27 +0000
410@@ -19,7 +19,7 @@
411 Configuration files
412 -------------------
413
414-Configuration files are located in ``$HOME/.bazaar`` on Linux/Unix and
415+Configuration files are located in ``$HOME/.bazaar`` on Unix and
416 ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` on
417 Windows. There are three primary configuration files in this location:
418
419
420=== modified file 'doc/en/user-guide/installing_bazaar.txt'
421--- doc/en/user-guide/installing_bazaar.txt 2009-09-09 15:08:17 +0000
422+++ doc/en/user-guide/installing_bazaar.txt 2010-06-02 05:16:27 +0000
423@@ -1,11 +1,11 @@
424 Installing Bazaar
425 =================
426
427-Linux
428------
429+GNU/Linux
430+---------
431
432-Bazaar packages are available for most popular Linux distributions
433-including Ubuntu/Debian, Red Hat and Gentoo.
434+Bazaar packages are available for most popular GNU/Linux distributions
435+including Ubuntu, Debian, Red Hat and Gentoo.
436 See http://bazaar-vcs.org/Download for the latest instructions.
437
438 Windows
439
440=== modified file 'doc/en/user-guide/plugins.txt'
441--- doc/en/user-guide/plugins.txt 2009-12-02 20:34:07 +0000
442+++ doc/en/user-guide/plugins.txt 2010-06-02 05:16:27 +0000
443@@ -35,13 +35,13 @@
444
445 Installing a plugin is very easy! If not already created, create a
446 ``plugins`` directory under your Bazaar configuration directory,
447-``~/.bazaar/`` on Linux and
448+``~/.bazaar/`` on Unix and
449 ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\``
450 on Windows. Within this directory (referred to as $BZR_HOME below),
451 each plugin is placed in its own subdirectory.
452
453 Plugins work particularly well with Bazaar branches. For example, to
454-install the bzrtools plugins for your main user account on Linux,
455+install the bzrtools plugins for your main user account on GNU/Linux,
456 one can perform the following::
457
458 bzr branch http://panoramicfeedback.com/opensource/bzr/bzrtools
459
460=== modified file 'doc/en/user-guide/setting_up_email.txt'
461--- doc/en/user-guide/setting_up_email.txt 2009-12-02 20:34:07 +0000
462+++ doc/en/user-guide/setting_up_email.txt 2010-06-02 05:16:27 +0000
463@@ -62,7 +62,7 @@
464 --------------------------------------------
465
466 To use the default ini file, create or edit the ``bazaar.conf`` file (in
467-``~/.bazaar/`` on Linux and in ``%APPDATA%\bazaar\2.0\`` in Windows)
468+``~/.bazaar/`` on Unix and in ``%APPDATA%\bazaar\2.0\`` in Windows)
469 and set an email address as shown below. Please note that the word DEFAULT
470 is case sensitive, and must be in upper-case.
471 ::
472
473=== modified file 'doc/en/user-guide/version_info.txt'
474--- doc/en/user-guide/version_info.txt 2009-12-02 20:34:07 +0000
475+++ doc/en/user-guide/version_info.txt 2010-06-02 05:16:27 +0000
476@@ -25,7 +25,7 @@
477 branch-nick: bzr.dev
478
479 You can easily filter that output using operating system tools or
480-scripts. For example (on Linux/Unix)::
481+scripts. For example::
482
483 $ bzr version-info | grep ^date
484 date: 2007-12-11 17:51:18 +0000