Retro

Merge lp:~tangentstorm/retro-language/docwork into lp:retro-language

  1. docwork
  2. Merge into retro
Proposed by michal j. wallace
Status: Merged
Merged at revision: 359
Proposed branch: lp:~tangentstorm/retro-language/docwork
Merge into: lp:retro-language
Diff against target: 76 lines (+19/-8)
1 file modified
doc/Contributing.rst (+19/-8)
To merge this branch: bzr merge lp:~tangentstorm/retro-language/docwork
Reviewer Review Type Date Requested Status
Charles Childers Pending
Review via email: mp+127089@code.launchpad.net
To post a comment you must log in.
lp:~tangentstorm/retro-language/docwork updated
359. By crc <crc@questor>

pull in documentation update from tangentstorm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/Contributing.rst'
2--- doc/Contributing.rst 2012-01-21 13:08:16 +0000
3+++ doc/Contributing.rst 2012-09-29 03:16:19 +0000
4@@ -2,28 +2,35 @@
5 Contributing
6 ============
7
8-Starting with the 11.3 release, we are using the services of Launchpad to
9+Starting with the 11.3 release, we are using the services of `Launchpad`_ to
10 manage the repositories and bug tracking. While not mandatory, it is
11-recommended that you create a Launchpad account if you plan to contribute
12+recommended that you `create a Launchpad account`_ if you plan to contribute
13 to the main repository.
14
15+.. _`Launchpad`: https://launchpad.net/
16+.. _`repositories`: https://code.launchpad.net/retro-language
17+.. _`create a Launchpad account`: https://login.launchpad.net/+new_account
18
19 -----------
20 Bug Reports
21 -----------
22
23-Bugs can be reported to the mailing list or via the bug tracker on
24+Bugs can be reported to the `mailing list`_ or via the `bug tracker`_ on
25 Launchpad. I would prefer use of the bug tracker.
26
27+.. _`mailing list`: http://groups.google.com/group/retro-10
28+.. _`bug tracker`: https://bugs.launchpad.net/retro-language
29
30 ------
31 Bazaar
32 ------
33
34-With 11.3, we have moved development to a Bazaar repository. This should
35-make handling incoming patchs somewhat easier. You can make a branch, and
36+With 11.3, we have moved development to a Bazaar_ repository. This should
37+make handling incoming patches somewhat easier. You can make a branch, and
38 we can merge it into the main repository as necessary.
39
40+.. _Bazaar : http://bazaar.canonical.com/en/
41+
42 * Create a Launchpad account
43 * Register an SSH key
44
45@@ -51,12 +58,13 @@
46 bzr push lp:~<username>/retro-language/<branchname>
47
48 Replace <username> and <branchname> with your Launchpad account name and
49-the name of your branch. Once this is done, future **bzr push** invokations
50+the name of your branch. Once this is done, future **bzr push** invocations
51 should use the specified branch by default.
52
53-When you're ready for me to merge, file a merge request on Launchpad, or
54+When you're ready for me to merge, `file a merge request`_ on Launchpad, or
55 send me an email.
56
57+.. _`file a merge request`: https://help.launchpad.net/Code/Review#Proposing_a_merge
58
59 -------
60 Patches
61@@ -71,7 +79,7 @@
62 Legal
63 -----
64
65-Retro is distributed under the ISC license. This is provided in the LICENSE
66+Retro is distributed under the `ISC license`_. This is provided in the LICENSE_
67 file. Unless otherwise noted, any contributions are added under this license.
68 If this is not acceptable, please advise with any emails or merge requests.
69 I am willing to accept code under other permissive licenses (e.g., the modern
70@@ -82,3 +90,6 @@
71 the current year(s). It's also recommended that you add your name and copyright
72 year(s) to any modified source files.
73
74+.. _`ISC license`: http://en.wikipedia.org/wiki/ISC_license
75+.. _LICENSE: http://bazaar.launchpad.net/~crc-x/retro-language/retro/view/head:/LICENSE
76+

Subscribers

People subscribed via source and target branches