Merge lp:~paulbrianstewart/ubuntu/oneiric/gambas2/857834-Missing-Word-Fix into lp:ubuntu/oneiric/gambas2

Proposed by Paul Stewart
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~paulbrianstewart/ubuntu/oneiric/gambas2/857834-Missing-Word-Fix
Merge into: lp:ubuntu/oneiric/gambas2
Diff against target: 435 lines (+48/-48)
1 file modified
debian/control (+48/-48)
To merge this branch: bzr merge lp:~paulbrianstewart/ubuntu/oneiric/gambas2/857834-Missing-Word-Fix
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+76826@code.launchpad.net

Commit message

* Changed "...database- and..." to "...database-enabled and..." in Control file description

Description of the change

* Changed "...database- and..." to "...database-enabled and..." in Control file description

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Are you sure about this? In the written English I'm familiar with,
"database- and network-enabled" is an acceptable and indeed recommended
shorthand even in formal writing for "database-enabled and
network-enabled".

Wikipedia describes this usage here:

  http://en.wikipedia.org/wiki/Hyphenation#Suspended_hyphens

Revision history for this message
Paul Stewart (paulbrianstewart) wrote :

> Are you sure about this? In the written English I'm familiar with,
> "database- and network-enabled" is an acceptable and indeed recommended
> shorthand even in formal writing for "database-enabled and
> network-enabled".
>
> Wikipedia describes this usage here:
>
> http://en.wikipedia.org/wiki/Hyphenation#Suspended_hyphens

I wouldn't bet my life on it Colin, I just thought it looked better, but that is my opinion. Please use or ignore at your discretion.

Revision history for this message
Paul Stewart (paulbrianstewart) wrote :

> Are you sure about this? In the written English I'm familiar with,
> "database- and network-enabled" is an acceptable and indeed recommended
> shorthand even in formal writing for "database-enabled and
> network-enabled".
>
> Wikipedia describes this usage here:
>
> http://en.wikipedia.org/wiki/Hyphenation#Suspended_hyphens

Reading the wiki article I think you are correct. Does the Ubuntu style guide use this formatting?

I should have mentioned or tagged this as my opinion, rather than fact.
Thanks
Paul

Unmerged revisions

33. By Paul Stewart

* Changed "...database- and..." to "...database-enabled and..." in Control file description

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2011-05-01 13:00:52 +0000
3+++ debian/control 2011-09-23 22:40:44 +0000
4@@ -15,7 +15,7 @@
5 Gambas is a programming language based on a BASIC interpreter with
6 object extensions - like Visual Basic, though it is NOT a clone!
7 It has many components for developing internationalized,
8- desktop-independent, database- and network-enabled applications.
9+ desktop-independent, database-enabled and network-enabled applications.
10 Even games can be developed very quickly using its RAD environment.
11 .
12 This package doesn't include anything: it is a metapackage to install the
13@@ -29,7 +29,7 @@
14 Gambas is a programming language based on a BASIC interpreter with
15 object extensions - like Visual Basic, though it is NOT a clone!
16 It has many components for developing internationalized,
17- desktop-independent, database- and network-enabled applications.
18+ desktop-independent, database-enabled and network-enabled applications.
19 Even games can be developed very quickly using its RAD environment.
20 .
21 This package includes the gambas compiler, archiver and informer.
22@@ -42,7 +42,7 @@
23 Gambas is a programming language based on a BASIC interpreter with
24 object extensions - like Visual Basic, though it is NOT a clone!
25 It has many components for developing internationalized,
26- desktop-independent, database- and network-enabled applications.
27+ desktop-independent, database-enabled and network-enabled applications.
28 Even games can be developed very quickly using its RAD environment.
29 .
30 This package provides the examples, help and documentation
31@@ -55,7 +55,7 @@
32 Gambas is a programming language based on a BASIC interpreter with
33 object extensions - like Visual Basic, though it is NOT a clone!
34 It has many components for developing internationalized,
35- desktop-independent, database- and network-enabled applications.
36+ desktop-independent, database-enabled and network-enabled applications.
37 Even games can be developed very quickly using its RAD environment.
38 .
39 This is a native gambas component to draw charts.
40@@ -68,7 +68,7 @@
41 Gambas is a programming language based on a BASIC interpreter with
42 object extensions - like Visual Basic, though it is NOT a clone!
43 It has many components for developing internationalized,
44- desktop-independent, database- and network-enabled applications.
45+ desktop-independent, database-enabled and network-enabled applications.
46 Even games can be developed very quickly using its RAD environment.
47 .
48 This component have the needed base libraries for the rest of compression
49@@ -82,7 +82,7 @@
50 Gambas is a programming language based on a BASIC interpreter with
51 object extensions - like Visual Basic, though it is NOT a clone!
52 It has many components for developing internationalized,
53- desktop-independent, database- and network-enabled applications.
54+ desktop-independent, database-enabled and network-enabled applications.
55 Even games can be developed very quickly using its RAD environment.
56 .
57 This component allows you to compress/uncompress data or files with
58@@ -96,7 +96,7 @@
59 Gambas is a programming language based on a BASIC interpreter with
60 object extensions - like Visual Basic, though it is NOT a clone!
61 It has many components for developing internationalized,
62- desktop-independent, database- and network-enabled applications.
63+ desktop-independent, database-enabled and network-enabled applications.
64 Even games can be developed very quickly using its RAD environment.
65 .
66 This component allows you to compress/uncompress data or files with
67@@ -110,7 +110,7 @@
68 Gambas is a programming language based on a BASIC interpreter with
69 object extensions - like Visual Basic, though it is NOT a clone!
70 It has many components for developing internationalized,
71- desktop-independent, database- and network-enabled applications.
72+ desktop-independent, database-enabled and network-enabled applications.
73 Even games can be developed very quickly using its RAD environment.
74 .
75 This component allows to use the crypt() glib function in gambas.
76@@ -123,7 +123,7 @@
77 Gambas is a programming language based on a BASIC interpreter with
78 object extensions - like Visual Basic, though it is NOT a clone!
79 It has many components for developing internationalized,
80- desktop-independent, database- and network-enabled applications.
81+ desktop-independent, database-enabled and network-enabled applications.
82 Even games can be developed very quickly using its RAD environment.
83 .
84 This component provides the needed common libraries for data access
85@@ -136,7 +136,7 @@
86 Gambas is a programming language based on a BASIC interpreter with
87 object extensions - like Visual Basic, though it is NOT a clone!
88 It has many components for developing internationalized,
89- desktop-independent, database- and network-enabled applications.
90+ desktop-independent, database-enabled and network-enabled applications.
91 Even games can be developed very quickly using its RAD environment.
92 .
93 This component allows you to access Firebird databases.
94@@ -149,7 +149,7 @@
95 Gambas is a programming language based on a BASIC interpreter with
96 object extensions - like Visual Basic, though it is NOT a clone!
97 It has many components for developing internationalized,
98- desktop-independent, database- and network-enabled applications.
99+ desktop-independent, database-enabled and network-enabled applications.
100 Even games can be developed very quickly using its RAD environment.
101 .
102 This is a native gambas component that implements data bound controls.
103@@ -164,7 +164,7 @@
104 Gambas is a programming language based on a BASIC interpreter with
105 object extensions - like Visual Basic, though it is NOT a clone!
106 It has many components for developing internationalized,
107- desktop-independent, database- and network-enabled applications.
108+ desktop-independent, database-enabled and network-enabled applications.
109 Even games can be developed very quickly using its RAD environment.
110 .
111 This component allows you to access MySQL databases.
112@@ -177,7 +177,7 @@
113 Gambas is a programming language based on a BASIC interpreter with
114 object extensions - like Visual Basic, though it is NOT a clone!
115 It has many components for developing internationalized,
116- desktop-independent, database- and network-enabled applications.
117+ desktop-independent, database-enabled and network-enabled applications.
118 Even games can be developed very quickly using its RAD environment.
119 .
120 This component allows you to access to databases via unixODBC drivers
121@@ -191,7 +191,7 @@
122 Gambas is a programming language based on a BASIC interpreter with
123 object extensions - like Visual Basic, though it is NOT a clone!
124 It has many components for developing internationalized,
125- desktop-independent, database- and network-enabled applications.
126+ desktop-independent, database-enabled and network-enabled applications.
127 Even games can be developed very quickly using its RAD environment.
128 .
129 This component allows you to access PostgreSQL databases.
130@@ -204,7 +204,7 @@
131 Gambas is a programming language based on a BASIC interpreter with
132 object extensions - like Visual Basic, though it is NOT a clone!
133 It has many components for developing internationalized,
134- desktop-independent, database- and network-enabled applications.
135+ desktop-independent, database-enabled and network-enabled applications.
136 Even games can be developed very quickly using its RAD environment.
137 .
138 This component allows you to access to sqlite 2 databases (not for sqlite 3,
139@@ -219,7 +219,7 @@
140 Gambas is a programming language based on a BASIC interpreter with
141 object extensions - like Visual Basic, though it is NOT a clone!
142 It has many components for developing internationalized,
143- desktop-independent, database- and network-enabled applications.
144+ desktop-independent, database-enabled and network-enabled applications.
145 Even games can be developed very quickly using its RAD environment.
146 .
147 This component allows you to access to sqlite3 databases (not for sqlite 2,
148@@ -233,7 +233,7 @@
149 Gambas is a programming language based on a BASIC interpreter with
150 object extensions - like Visual Basic, though it is NOT a clone!
151 It has many components for developing internationalized,
152- desktop-independent, database- and network-enabled applications.
153+ desktop-independent, database-enabled and network-enabled applications.
154 Even games can be developed very quickly using its RAD environment.
155 .
156 This component provides an access to the Portland project
157@@ -247,7 +247,7 @@
158 Gambas is a programming language based on a BASIC interpreter with
159 object extensions - like Visual Basic, though it is NOT a clone!
160 It has many components for developing internationalized,
161- desktop-independent, database- and network-enabled applications.
162+ desktop-independent, database-enabled and network-enabled applications.
163 Even games can be developed very quickly using its RAD environment.
164 .
165 This is a native gambas component to serve as base for graphic components.
166@@ -260,7 +260,7 @@
167 Gambas is a programming language based on a BASIC interpreter with
168 object extensions - like Visual Basic, though it is NOT a clone!
169 It has many components for developing internationalized,
170- desktop-independent, database- and network-enabled applications.
171+ desktop-independent, database-enabled and network-enabled applications.
172 Even games can be developed very quickly using its RAD environment.
173 .
174 This is a native gambas component that implements the Workspace control.
175@@ -273,7 +273,7 @@
176 Gambas is a programming language based on a BASIC interpreter with
177 object extensions - like Visual Basic, though it is NOT a clone!
178 It has many components for developing internationalized,
179- desktop-independent, database- and network-enabled applications.
180+ desktop-independent, database-enabled and network-enabled applications.
181 Even games can be developed very quickly using its RAD environment.
182 .
183 This is a native gambas component that implements the Workspace control.
184@@ -286,7 +286,7 @@
185 Gambas is a programming language based on a BASIC interpreter with
186 object extensions - like Visual Basic, though it is NOT a clone!
187 It has many components for developing internationalized,
188- desktop-independent, database- and network-enabled applications.
189+ desktop-independent, database-enabled and network-enabled applications.
190 Even games can be developed very quickly using its RAD environment.
191 .
192 These are the gtk components for Gambas.
193@@ -299,7 +299,7 @@
194 Gambas is a programming language based on a BASIC interpreter with
195 object extensions - like Visual Basic, though it is NOT a clone!
196 It has many components for developing internationalized,
197- desktop-independent, database- and network-enabled applications.
198+ desktop-independent, database-enabled and network-enabled applications.
199 Even games can be developed very quickly using its RAD environment.
200 .
201 These are new properties for the gtk components for Gambas. At this
202@@ -313,7 +313,7 @@
203 Gambas is a programming language based on a BASIC interpreter with
204 object extensions - like Visual Basic, though it is NOT a clone!
205 It has many components for developing internationalized,
206- desktop-independent, database- and network-enabled applications.
207+ desktop-independent, database-enabled and network-enabled applications.
208 Even games can be developed very quickly using its RAD environment.
209 .
210 This component is able to load SVG files and generate an image memory of
211@@ -328,7 +328,7 @@
212 Gambas is a programming language based on a BASIC interpreter with
213 object extensions - like Visual Basic, though it is NOT a clone!
214 It has many components for developing internationalized,
215- desktop-independent, database- and network-enabled applications.
216+ desktop-independent, database-enabled and network-enabled applications.
217 Even games can be developed very quickly using its RAD environment.
218 .
219 This component just loads gb.qt if you are running KDE or gb.gtk in
220@@ -345,7 +345,7 @@
221 Gambas is a programming language based on a BASIC interpreter with
222 object extensions - like Visual Basic, though it is NOT a clone!
223 It has many components for developing internationalized,
224- desktop-independent, database- and network-enabled applications.
225+ desktop-independent, database-enabled and network-enabled applications.
226 Even games can be developed very quickly using its RAD environment.
227 .
228 PDF renderer component based on Poppler library
229@@ -358,7 +358,7 @@
230 Gambas is a programming language based on a BASIC interpreter with
231 object extensions - like Visual Basic, though it is NOT a clone!
232 It has many components for developing internationalized,
233- desktop-independent, database- and network-enabled applications.
234+ desktop-independent, database-enabled and network-enabled applications.
235 Even games can be developed very quickly using its RAD environment.
236 .
237 This is a new component for applying many various effects on images.
238@@ -374,7 +374,7 @@
239 Gambas is a programming language based on a BASIC interpreter with
240 object extensions - like Visual Basic, though it is NOT a clone!
241 It has many components for developing internationalized,
242- desktop-independent, database- and network-enabled applications.
243+ desktop-independent, database-enabled and network-enabled applications.
244 Even games can be developed very quickly using its RAD environment.
245 .
246 This is a native gambas component to provide a lot of information about
247@@ -388,7 +388,7 @@
248 Gambas is a programming language based on a BASIC interpreter with
249 object extensions - like Visual Basic, though it is NOT a clone!
250 It has many components for developing internationalized,
251- desktop-independent, database- and network-enabled applications.
252+ desktop-independent, database-enabled and network-enabled applications.
253 Even games can be developed very quickly using its RAD environment.
254 .
255 This component allows you to use TCP/IP and UDP sockets, and to access
256@@ -402,7 +402,7 @@
257 Gambas is a programming language based on a BASIC interpreter with
258 object extensions - like Visual Basic, though it is NOT a clone!
259 It has many components for developing internationalized,
260- desktop-independent, database- and network-enabled applications.
261+ desktop-independent, database-enabled and network-enabled applications.
262 Even games can be developed very quickly using its RAD environment.
263 .
264 This component allows your programs to easily become FTP or HTTP clients.
265@@ -415,7 +415,7 @@
266 Gambas is a programming language based on a BASIC interpreter with
267 object extensions - like Visual Basic, though it is NOT a clone!
268 It has many components for developing internationalized,
269- desktop-independent, database- and network-enabled applications.
270+ desktop-independent, database-enabled and network-enabled applications.
271 Even games can be developed very quickly using its RAD environment.
272 .
273 This component allows sending emails using smtp protocol.
274@@ -431,7 +431,7 @@
275 Gambas is a programming language based on a BASIC interpreter with
276 object extensions - like Visual Basic, though it is NOT a clone!
277 It has many components for developing internationalized,
278- desktop-independent, database- and network-enabled applications.
279+ desktop-independent, database-enabled and network-enabled applications.
280 Even games can be developed very quickly using its RAD environment.
281 .
282 This component allows you 3D programming with OpenGL in gambas.
283@@ -444,7 +444,7 @@
284 Gambas is a programming language based on a BASIC interpreter with
285 object extensions - like Visual Basic, though it is NOT a clone!
286 It has many components for developing internationalized,
287- desktop-independent, database- and network-enabled applications.
288+ desktop-independent, database-enabled and network-enabled applications.
289 Even games can be developed very quickly using its RAD environment.
290 .
291 This experimental component allows you to use Perl compatible regular
292@@ -458,7 +458,7 @@
293 Gambas is a programming language based on a BASIC interpreter with
294 object extensions - like Visual Basic, though it is NOT a clone!
295 It has many components for developing internationalized,
296- desktop-independent, database- and network-enabled applications.
297+ desktop-independent, database-enabled and network-enabled applications.
298 Even games can be developed very quickly using its RAD environment.
299 .
300 This package includes the Gambas QT GUI component.
301@@ -472,7 +472,7 @@
302 Gambas is a programming language based on a BASIC interpreter with
303 object extensions - like Visual Basic, though it is NOT a clone!
304 It has many components for developing internationalized,
305- desktop-independent, database- and network-enabled applications.
306+ desktop-independent, database-enabled and network-enabled applications.
307 Even games can be developed very quickly using its RAD environment.
308 .
309 This component includes some uncommon QT controls.
310@@ -485,7 +485,7 @@
311 Gambas is a programming language based on a BASIC interpreter with
312 object extensions - like Visual Basic, though it is NOT a clone!
313 It has many components for developing internationalized,
314- desktop-independent, database- and network-enabled applications.
315+ desktop-independent, database-enabled and network-enabled applications.
316 Even games can be developed very quickly using its RAD environment.
317 .
318 This component allows you integrate OpenGL in qt applications.
319@@ -498,7 +498,7 @@
320 Gambas is a programming language based on a BASIC interpreter with
321 object extensions - like Visual Basic, though it is NOT a clone!
322 It has many components for developing internationalized,
323- desktop-independent, database- and network-enabled applications.
324+ desktop-independent, database-enabled and network-enabled applications.
325 Even games can be developed very quickly using its RAD environment.
326 .
327 This component gives the tools and methods to create reports using Gambas
328@@ -512,7 +512,7 @@
329 Gambas is a programming language based on a BASIC interpreter with
330 object extensions - like Visual Basic, though it is NOT a clone!
331 It has many components for developing internationalized,
332- desktop-independent, database- and network-enabled applications.
333+ desktop-independent, database-enabled and network-enabled applications.
334 Even games can be developed very quickly using its RAD environment.
335 .
336 This component use the ttf fonts parts of the SDL library.
337@@ -527,7 +527,7 @@
338 Gambas is a programming language based on a BASIC interpreter with
339 object extensions - like Visual Basic, though it is NOT a clone!
340 It has many components for developing internationalized,
341- desktop-independent, database- and network-enabled applications.
342+ desktop-independent, database-enabled and network-enabled applications.
343 Even games can be developed very quickly using its RAD environment.
344 .
345 This component use the sound image parts of the SDL library.
346@@ -542,7 +542,7 @@
347 Gambas is a programming language based on a BASIC interpreter with
348 object extensions - like Visual Basic, though it is NOT a clone!
349 It has many components for developing internationalized,
350- desktop-independent, database- and network-enabled applications.
351+ desktop-independent, database-enabled and network-enabled applications.
352 Even games can be developed very quickly using its RAD environment.
353 .
354 This is a component made in gambas providing several utilities
355@@ -555,7 +555,7 @@
356 # Gambas is a programming language based on a BASIC interpreter with
357 # object extensions - like Visual Basic, though it is NOT a clone!
358 # It has many components for developing internationalized,
359-# desktop-independent, database- and network-enabled applications.
360+# desktop-independent, database-enabled and network-enabled applications.
361 # Even games can be developed very quickly using its RAD environment.
362 # .
363 # This is a component to use v4l with gambas.
364@@ -568,7 +568,7 @@
365 Gambas is a programming language based on a BASIC interpreter with
366 object extensions - like Visual Basic, though it is NOT a clone!
367 It has many components for developing internationalized,
368- desktop-independent, database- and network-enabled applications.
369+ desktop-independent, database-enabled and network-enabled applications.
370 Even games can be developed very quickly using its RAD environment.
371 .
372 This is a component to give compatibility with some MS Visual Basic
373@@ -582,7 +582,7 @@
374 Gambas is a programming language based on a BASIC interpreter with
375 object extensions - like Visual Basic, though it is NOT a clone!
376 It has many components for developing internationalized,
377- desktop-independent, database- and network-enabled applications.
378+ desktop-independent, database-enabled and network-enabled applications.
379 Even games can be developed very quickly using its RAD environment.
380 .
381 This is a component for making CGI web applications using gambas,
382@@ -596,7 +596,7 @@
383 Gambas is a programming language based on a BASIC interpreter with
384 object extensions - like Visual Basic, though it is NOT a clone!
385 It has many components for developing internationalized,
386- desktop-independent, database- and network-enabled applications.
387+ desktop-independent, database-enabled and network-enabled applications.
388 Even games can be developed very quickly using its RAD environment.
389 .
390 This component brings the power of the libxml libraries to Gambas.
391@@ -609,7 +609,7 @@
392 Gambas is a programming language based on a BASIC interpreter with
393 object extensions - like Visual Basic, though it is NOT a clone!
394 It has many components for developing internationalized,
395- desktop-independent, database- and network-enabled applications.
396+ desktop-independent, database-enabled and network-enabled applications.
397 Even games can be developed very quickly using its RAD environment.
398 .
399 This component allows using RPC from a Gambas application
400@@ -622,7 +622,7 @@
401 Gambas is a programming language based on a BASIC interpreter with
402 object extensions - like Visual Basic, though it is NOT a clone!
403 It has many components for developing internationalized,
404- desktop-independent, database- and network-enabled applications.
405+ desktop-independent, database-enabled and network-enabled applications.
406 Even games can be developed very quickly using its RAD environment.
407 .
408 This component brings the power of the libxslt libraries to Gambas.
409@@ -636,7 +636,7 @@
410 Gambas is a programming language based on a BASIC interpreter with
411 object extensions - like Visual Basic, though it is NOT a clone!
412 It has many components for developing internationalized,
413- desktop-independent, database- and network-enabled applications.
414+ desktop-independent, database-enabled and network-enabled applications.
415 Even games can be developed very quickly using its RAD environment.
416 .
417 This package includes the Gambas Development Environment and the
418@@ -650,7 +650,7 @@
419 Gambas is a programming language based on a BASIC interpreter with
420 object extensions - like Visual Basic, though it is NOT a clone!
421 It has many components for developing internationalized,
422- desktop-independent, database- and network-enabled applications.
423+ desktop-independent, database-enabled and network-enabled applications.
424 Even games can be developed very quickly using its RAD environment.
425 .
426 This package includes the Gambas interpreter needed to run Gambas applications.
427@@ -663,7 +663,7 @@
428 Gambas is a programming language based on a BASIC interpreter with
429 object extensions - like Visual Basic, though it is NOT a clone!
430 It has many components for developing internationalized,
431- desktop-independent, database- and network-enabled applications.
432+ desktop-independent, database-enabled and network-enabled applications.
433 Even games can be developed very quickly using its RAD environment.
434 .
435 This package includes the needed files to use Gambas as a scripting language.

Subscribers

People subscribed via source and target branches

to all changes: