[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-103-g026ba8b

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 026ba8b941bc336f140c48c042a1fbd1791fa66a
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Apr 25 00:00:08 2012 +0200

    fix several typos; thanks to Simon Kainz for the report and patch; Closes: #669249

diff --git a/bin/reportbug b/bin/reportbug
index 3531e4a..95757b0 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1733,7 +1733,7 @@ class UI(object):
             if 'qa.debian.org' in maintainer:
                 ui.long_message('''\
 This package seems to be currently "orphaned"; it also seems you're a
-bit interested in this package, since you're reporting a but against
+bit interested in this package, since you're reporting a bug against
 it, so you might consider adopting it.  Please be aware that your
 report may not be resolved for a while, because the package lacks an
 active maintainer, but please GO ON and REPORT the bug, if there is
diff --git a/debian/changelog b/debian/changelog
index 08e7451..6e15414 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,11 @@ reportbug (6.3.2) UNRELEASED; urgency=low
   * reportbug/{debbugs, utils}.py
     - report foreign architectures information (if m-a); thanks to Cyril
       Brulebois for the report; Closes: #658795
+  * bin/reportbug, man/reportbug.*
+    - fix several typos; thanks to Simon Kainz for the report and patch;
+      Closes: #669249
 
- -- Sandro Tosi <morph at debian.org>  Sun, 08 Apr 2012 00:55:40 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 24 Apr 2012 23:59:14 +0200
 
 reportbug (6.3.1) unstable; urgency=low
 
diff --git a/man/reportbug.1 b/man/reportbug.1
index b30df32..9e5d487 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -232,7 +232,7 @@ Only send the bug to the package maintainer; the bug tracking system
 will not send a copy to the bug report distribution lists.
 .TP
 .B \-\-max-attachment-size=MAX_ATTACHMENT_SIZE
-Specity the maximum size any attachment file can have (this also include the file for \-\-body-file option). If an attachment file is too big, there could be problems in delivering the email (and also to compose it), so we set a limit to attachment size. By default this is 10 megabytes.
+Specify the maximum size any attachment file can have (this also include the file for \-\-body-file option). If an attachment file is too big, there could be problems in delivering the email (and also to compose it), so we set a limit to attachment size. By default this is 10 megabytes.
 .TP
 .B \-\-mirror=MIRRORS
 Add a BTS mirror.
@@ -442,7 +442,7 @@ specified on the command line.
 .TP
 .B \-\-template
 Output a template report to standard output. Differently from
-\fP\-p/\-\-print\fP, it tries to be not interactive, and present a
+\fP\-p/\-\-print\fP, it tries to be not interactive, and presents a
 template without user's input.
 .TP
 .B \-u INTERFACE, \-\-interface=INTERFACE, \-\-ui=INTERFACE
diff --git a/man/reportbug.conf.5 b/man/reportbug.conf.5
index 8ccbf41..3493889 100644
--- a/man/reportbug.conf.5
+++ b/man/reportbug.conf.5
@@ -37,7 +37,7 @@ options.  The default location of the file is
 
 Please note that any configuration file has to be a valid UTF-8
 document, and not in a different locale; this is particularly
-important in situations where localized characters has to be used
+important in situations where localized characters have to be used
 (like for realname).
 .SH "FILE FORMAT"
 Configuration options can be specified in the form
@@ -158,7 +158,7 @@ The address of a BTS mirror. Example:
 The default operating mode for \fBreportbug(1)\fP.
 .TP
 .B mta
-The path to the MTA used.  Any any SMTP server on Debian should be OK
+The path to the MTA used.  Any SMTP server on Debian should be OK
 with the default:
 
 \fBmta\fP \fI/usr/sbin/sendmail\fP
@@ -191,7 +191,7 @@ Disables querying the source packages for bugs.
 Disables all external queries.
 .TP
 .B paranoid
-Paranoid mode: print the whole email envelope before sending it
+Paranoid mode: print the whole email envelope before sending it.
 .TP
 .B printonly
 Print the report on screen, don't sent it.
@@ -204,7 +204,7 @@ See the \fB\-\-report-quiet\fP entry in \fBreportbug(1)\fP.
 .TP
 .B realname
 The default real-name in the \fBFrom\fP address of the bug email
-(override with environment variables, see \fBreportbug(1)\fP. Example:
+(override with environment variables, see \fBreportbug(1)\fP). Example:
 
 \fBrealname\fP \fI"Humberto Flores III"\fP
 
@@ -265,7 +265,7 @@ using \fBdebsums\fP, if available.
 .SH "SEE ALSO"
 reportbug(1), querybts(1)
 .SH AUTHOR
-reportbug was written by Chris Lawrence <lawrencc at debian.org> and it's now maintained by Sandro Tosi <morph at debian.org>
+reportbug was written by Chris Lawrence <lawrencc at debian.org> and it's now maintained by Sandro Tosi <morph at debian.org>.
 .PP
 This manual page was written by Y Giridhar Appaji Nag
 <giridhar at appaji.net> for the Debian project, but may be used by others.

-- 
Reportbug - reports bugs in the Debian distribution