Merge lp:~antonio-gonzalez-mx/ubuntu/quantal/clipf/fix-953768 into lp:ubuntu/quantal/clipf

[Antonio de Jesus Gonzalez Preciado]

fixed typo "overriden" changed to "overridden" (LP: #953768)

[Luke Yelavich (themuso)]

Thanks for your work. Since this is a small change and not critical to the package's functionality, you might want to consider sending this to Debian instaed. There is no real reason to introduce a delta between Debian and Ubuntu over one small change like this. Have a look at http://developer.ubuntu.com/packaging/html/fixing-a-bug-example.html for some pointers.

Thanks again.

review: Abstain

[Brian Murray (brian-murray)]

There is an existing debian bug for this at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663668

Unmerged revisions

3. By Antonio de Jesus Gonzalez Preciado on 2012-09-08

"overriden" changed to "overridden" (LP: #953768)

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-25 16:40:41 +0000
+++ debian/changelog	2012-09-08 22:02:17 +0000
@@ -1,3 +1,9 @@
+clipf (0.4-1ubuntu1) quantal; urgency=low
+
+  * "overriden" changed to "overridden" (LP: #953768)
+
+ -- Antonio Gonzalez<[e-mail]>  Sat, 08 Sep 2012 15:55:22 -0500
+
 clipf (0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #535266) 
 
=== modified file 'man/clipf.1'
--- man/clipf.1	2009-06-25 16:40:41 +0000
+++ man/clipf.1	2012-09-08 22:02:17 +0000
@@ -123,7 +123,7 @@
 .RS
 .TP 
 .B date
-- default date for new operations. Can be overriden by \-d option of
+- default date for new operations. Can be overridden by \-d option of
 "op add".
 .TP 
 .B date_from
@@ -132,7 +132,7 @@
 - reporting period for "op ls" and all "rep" subcommands.
 .TP
 .B acc
-- default account for new operations. Can be overriden by \-a option
+- default account for new operations. Can be overridden by \-a option
 of "op add".
 .TP
 .B max_lines