Ground Control

Merge lp://staging/~vxnick/groundcontrol/docs into lp://staging/groundcontrol

  1. docs
  2. Merge into trunk
Proposed by Nick Trew
Status: Merged
Merge reported by: Martin Owens
Merged at revision: not available
Proposed branch: lp://staging/~vxnick/groundcontrol/docs
Merge into: lp://staging/groundcontrol
Diff against target: 104 lines (+21/-28)
8 files modified
doc/step/code-commited.txt (+5/-5)
doc/step/code-mergereq.txt (+2/-2)
doc/step/code-modified.txt (+2/-2)
doc/step/code-uploaded.txt (+3/-5)
doc/step/configure.txt (+3/-4)
doc/step/project.txt (+2/-2)
doc/step/projects.txt (+3/-7)
groundcontrol.desktop.in (+1/-1)
To merge this branch: bzr merge lp://staging/~vxnick/groundcontrol/docs
Reviewer Review Type Date Requested Status
Martin Owens Approve
Review via email: mp+18847@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Nick Trew (vxnick) wrote :

New documentation and minor change to descriptive string.

Revision history for this message
Martin Owens (doctormo) wrote :

Wonderful, thanks so much for your excellent concise descriptions of what's going on and what it means at each stage.

Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/step/code-commited.txt'
2--- doc/step/code-commited.txt 2010-02-03 17:34:38 +0000
3+++ doc/step/code-commited.txt 2010-02-08 16:08:12 +0000
4@@ -1,5 +1,5 @@
5-Your code has been commited locally, now you can choose to upload all your changes you've commited to a code branch in launchpad.
6-
7-This will show your changes to others and is recomended if you go away from the project for a length of time. Someone else could read your code in the meantime and either adopt it or offer advice on it.
8-
9-You can only upload once all changes have been commited.
10+Ground Control has committed the changes you have made to your local branch (the current directory).
11+
12+If you would like to share your changes with others you will need to upload your branch to Launchpad.
13+
14+You will not be able to upload until all changes have been committed to your local branch.
15\ No newline at end of file
16
17=== modified file 'doc/step/code-mergereq.txt'
18--- doc/step/code-mergereq.txt 2010-02-05 17:13:41 +0000
19+++ doc/step/code-mergereq.txt 2010-02-08 16:08:12 +0000
20@@ -1,3 +1,3 @@
21-Your merge request has been sent, now it's a matter of waiting for the developers to approve the changes you've done and take action in merging it into the parent branch.
22+Ground Control has created a merge request to alert the upstream developers that you wish to incorporate your changes into their branch.
23
24-You can refresh the status of the merge and view it in your web browser.
25+Any subsequent changes you make to this branch will be added to this merge request once you have committed locally and uploaded to Launchpad.
26\ No newline at end of file
27
28=== modified file 'doc/step/code-modified.txt'
29--- doc/step/code-modified.txt 2010-02-05 17:13:41 +0000
30+++ doc/step/code-modified.txt 2010-02-08 16:08:12 +0000
31@@ -1,3 +1,3 @@
32-You have changes or new files which should be committed as soon as you have finished your modifications.
33+Ground Control has determined that there are new and/or modified files within your local branch.
34
35-When ever you modify a file, the bar will change and you will see a new button. When you click this button you will be shown the changes and additions you've made and be allowed to commit them into your local recording of changes.
36+When you commit your changes, you will have the opportunity to describe the changes you have made. The description you enter should be accurate and succinct, as it serves as a history of your branch changes.
37\ No newline at end of file
38
39=== modified file 'doc/step/code-uploaded.txt'
40--- doc/step/code-uploaded.txt 2010-02-05 17:13:41 +0000
41+++ doc/step/code-uploaded.txt 2010-02-08 16:08:12 +0000
42@@ -1,5 +1,3 @@
43-Your changes have been uploaded and are ready for merging.
44-
45-What this means is that you've uploaded your code into a personal branch which everyone can see, but if you want the original developers to adopt your changes into their main version you will need to send them a request which asks them to merge your code.
46-
47-Normally they will review the code and let you know whether it's been merged or not.
48+Ground Control has uploaded your changes to a personal branch within your Launchpad account.
49+
50+You can now submit a merge request which will inform the project developers of your new hosted branch.
51\ No newline at end of file
52
53=== modified file 'doc/step/configure.txt'
54--- doc/step/configure.txt 2010-02-05 17:13:41 +0000
55+++ doc/step/configure.txt 2010-02-08 16:08:12 +0000
56@@ -1,4 +1,3 @@
57-Configuring your Launchpad account is an important initialisation which tells your computer who you are on Launchpad and allows you to access all of your own personal information from this desktop system.
58-
59-The configuration tool will not only tie your account, but will also make sure that all of the settings that should be setup to allow you to collaboratively work with others, are set appropriately in the right places.
60-
61+Ground Control needs to access and download information from your Launchpad account to this machine.
62+
63+You will have the opportunity to create a Launchpad account if you do not currently have one.
64\ No newline at end of file
65
66=== modified file 'doc/step/project.txt'
67--- doc/step/project.txt 2010-02-05 17:13:41 +0000
68+++ doc/step/project.txt 2010-02-08 16:08:12 +0000
69@@ -1,3 +1,3 @@
70-This is the project view where you can download any available version of a project's code base.
71+You are currently within the project view where you can create local branches of projects hosted on Launchpad.
72
73-Once downloaded, code can be worked upon and uploaded back to Launchpad for others to see.
74+Local branches can be uploaded to your Launchpad account and proposed for merging with the project's main development branch.
75\ No newline at end of file
76
77=== modified file 'doc/step/projects.txt'
78--- doc/step/projects.txt 2010-02-05 17:13:41 +0000
79+++ doc/step/projects.txt 2010-02-08 16:08:12 +0000
80@@ -1,7 +1,3 @@
81-This directory contains all of your project folders.
82-
83-From here you can load an existing project from Launchpad. This will create a new local folder for that project and allow you to begin downloading code.
84-
85-Each folder marked with a box icon is a Launchpad project which you navigate into to start work.
86-
87-To delete the project you simply delete the folder as you would normally.
88+You are currently within the projects directory. Here you can create local projects (and related branches) based upon those hosted on Launchpad.
89+
90+If you wish to delete the project, simply remove the project directory - this will also remove any local branches related to the project.
91\ No newline at end of file
92
93=== modified file 'groundcontrol.desktop.in'
94--- groundcontrol.desktop.in 2010-02-07 16:24:26 +0000
95+++ groundcontrol.desktop.in 2010-02-08 16:08:12 +0000
96@@ -1,7 +1,7 @@
97 [Desktop Entry]
98 _Name=Ground Control Configuration
99 _GenericName=Ground Control
100-_Comment=Set up your Launchpad account so it works with Ground Control seamlessly.
101+_Comment=Setup Ground Control with your Launchpad account.
102 Exec=lp-groundcontrol
103 Icon=groundcontrol
104 StartupNotify=false

Subscribers

People subscribed via source and target branches