Bazaar

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

  1. gnuness
  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: 5300
Proposed branch: lp:~mbp/bzr/gnuness
Merge into: lp:bzr
Diff against target: 60 lines (+9/-10)
2 files modified
doc/en/tutorials/using_bazaar_with_launchpad.txt (+8/-9)
doc/en/user-guide/introducing_bazaar.txt (+1/-1)
To merge this branch: bzr merge lp:~mbp/bzr/gnuness
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+27586@code.launchpad.net

Commit message

don't say "open source" in docs

Description of the change

rms famously dislikes the term 'open source'.

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

Trivial, please land, worth proposing for review for educational purposes though.

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

sent to pqm by email

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 'doc/en/tutorials/using_bazaar_with_launchpad.txt'
2--- doc/en/tutorials/using_bazaar_with_launchpad.txt 2009-12-02 20:34:07 +0000
3+++ doc/en/tutorials/using_bazaar_with_launchpad.txt 2010-06-15 06:51:29 +0000
4@@ -23,7 +23,7 @@
5 the software: the team, users, training partners, support partners,
6 third-party developers and so on.
7
8-Great communities are well understood in the open source world.
9+Great communities are well understood in the free software community.
10 Their applicability extends well beyond that though: most
11 successful commercial software vendors are well skilled at
12 building and managing the communities that grow up around
13@@ -93,8 +93,8 @@
14
15 As well as sponsoring `Ubuntu <http://www.ubuntu.com>`_ and
16 `Bazaar <http://bazaar-vcs.org>`_ development, Canonical
17-provides Launchpad, https://launchpad.net, as a free service
18-for the open source community. Launchpad is one of the most
19+provides Launchpad, <https://launchpad.net/>, as a free service
20+for the community. Launchpad is one of the most
21 exciting CDEs around for several notable reasons:
22
23 * it models relationships between many of things tracked, e.g.
24@@ -179,10 +179,10 @@
25 Accessing code in Launchpad using Bazaar
26 ========================================
27
28-Getting the code for an open source project
29--------------------------------------------
30+Getting the code for a project
31+------------------------------
32
33-As Launchpad keeps track of thousands of open source projects
34+As Launchpad keeps track of thousands of projects
35 and their latest code whether it be managed by Bazaar, CVS or Subversion,
36 Bazaar users can grab that code as easily as this::
37
38@@ -447,8 +447,7 @@
39 further integrated, please contact us on the Bazaar mailing list,
40 bazaar@lists.canonical.com.
41
42-While designed as a free service to support open source projects,
43+While designed as a free service to support free software projects,
44 Canonical may make Launchpad available to commercial software developers
45 depending on their requirements. We would be happy to hear from you
46-if you think Launchpad would be useful for managing your community,
47-open source or otherwise.
48+if you think Launchpad would be useful for managing your community.
49
50=== modified file 'doc/en/user-guide/introducing_bazaar.txt'
51--- doc/en/user-guide/introducing_bazaar.txt 2010-03-11 04:33:41 +0000
52+++ doc/en/user-guide/introducing_bazaar.txt 2010-06-15 06:51:29 +0000
53@@ -79,7 +79,7 @@
54 * trunk quality and stability can be kept higher, making everyone's
55 job less stressful
56
57- * in open source communities:
58+ * in open communities:
59
60 * easier for non-core developers to create and maintain changes
61