[developers-reference] 01/01: Fix spelling, grammar, capitalisation and wording issues
This is an automated email from the git hooks/post-receive script.
pabs pushed a commit to branch master
in repository developers-reference.
commit e58682611746888893a5a4f3f44282d292794d7d
Author: Paul Wise <pabs@debian.org>
Date: Sun Nov 5 09:35:26 2017 +0800
Fix spelling, grammar, capitalisation and wording issues
Suggested-by: codespell
Suggested-by: spellintian
---
best-pkging-practices.dbk | 18 +++++------
beyond-pkging.dbk | 2 +-
debian/changelog | 76 +++++++++++++++++++++++------------------------
new-maintainer.dbk | 2 +-
pkgs.dbk | 6 ++--
5 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/best-pkging-practices.dbk b/best-pkging-practices.dbk
index 1651ddb..27b5eca 100644
--- a/best-pkging-practices.dbk
+++ b/best-pkging-practices.dbk
@@ -110,7 +110,7 @@ but by the <literal>build</literal> rule of
</para>
<para>
<command>quilt</command> is the recommended tool for this.
-It does all of the above, and also allows to manage patch series.
+It does all of the above, and also allows one to manage patch series.
See the
<systemitem role="package">quilt</systemitem> package for more information.
</para>
@@ -1050,7 +1050,7 @@ original.
</para>
<para>
The short description should be able to stand on its own. Some interfaces do
-not show the long description by default, or only if the user explicitely asks
+not show the long description by default, or only if the user explicitly asks
for it or even do not show it at all. Avoid things like What do you want to
do?
</para>
@@ -1247,7 +1247,7 @@ __Choices: Afrikaans (af), Bulgarian (bg), Catalan (ca), Chinese (zh), Czech (cs
# This is the default choice. Translators may put their own language here
# instead of the default.
# WARNING : you MUST use the ENGLISH NAME of your language
-# For instance, the french translator will need to put French (fr) here.
+# For instance, the French translator will need to put French (fr) here.
_Default: English[ translators, please see comment in PO files]
_Description: Geneweb default language:
</screen>
@@ -1360,8 +1360,8 @@ Some tools (e.g. <systemitem role="package">po4a</systemitem>, <systemitem
role="package">poxml</systemitem>, or the <systemitem
role="package">translate-toolkit</systemitem>) are specialized in extracting
the translatable material from different formats. They produce PO files, a
-format quite common to translators, which permits to see what needs to be
-retranslated when the translated document is updated.
+format quite common to translators, which permits one to see what needs to be
+re-translated when the translated document is updated.
</para>
</section>
@@ -1441,7 +1441,7 @@ upstream.
</para>
<para>
The manpages do not need to be written directly in the troff format. Popular
-source formats are Docbook, POD and reST, which can be converted using
+source formats are DocBook, POD and reST, which can be converted using
<command>xsltproc</command>, <command>pod2man</command> and
<command>rst2man</command> respectively. To a lesser extent, the
<command>help2man</command> program can also be used to write a stub.
@@ -1466,7 +1466,7 @@ role="package">libmldbm-perl</systemitem> (arch independent perl module).
</listitem>
<listitem>
<para>
-Python related packages have their python policy; see
+Python related packages have their Python policy; see
&file-python-policy; in the <systemitem
role="package">python</systemitem> package.
</para>
@@ -1487,7 +1487,7 @@ policy</ulink>.
</listitem>
<listitem>
<para>
-Ocaml related packages have their own policy, found in
+OCaml related packages have their own policy, found in
&file-ocaml-policy; from the <systemitem
role="package">ocaml</systemitem> package. A good example is the <systemitem
role="package">camlzip</systemitem> source package.
@@ -1793,7 +1793,7 @@ this can aid in debugging many programs linked to a library. In general, debug
packages do not need to be added for all programs; doing so would bloat the
archive. But if a maintainer finds that users often need a debugging version
of a program, it can be worthwhile to make a debug package for it. Programs
-that are core infrastructure, such as apache and the X server are also good
+that are core infrastructure, such as Apache and the X server are also good
candidates for debug packages.
</para>
<para>
diff --git a/beyond-pkging.dbk b/beyond-pkging.dbk
index 7963b49..5197573 100644
--- a/beyond-pkging.dbk
+++ b/beyond-pkging.dbk
@@ -119,7 +119,7 @@ Usertags: <replaceable>tag-name [ tag-name ... ]</replaceable>
<replaceable>description-of-bug ...</replaceable>
</screen>
<para>
-Note that tags are seperated by spaces and cannot contain underscores. If you
+Note that tags are separated by spaces and cannot contain underscores. If you
are filing bugs for a particular group or team it is recommended that you
set the <literal>User</literal> to an appropriate mailing list after describing
your intention there.
diff --git a/debian/changelog b/debian/changelog
index 451aa03..20b0760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,8 @@ developers-reference (3.4.18) unstable; urgency=medium
* Also document List-Id header in package tracker mails.
[ Lev Lamberov ]
- * adding russian translation (Closes: #797603)
- * changing Makefile to handle russian translation
+ * adding Russian translation (Closes: #797603)
+ * changing Makefile to handle Russian translation
[ Anthony Fok ]
* Change ftp-master-mirror to coccia.debian.org
@@ -99,7 +99,7 @@ developers-reference (3.4.15) unstable; urgency=medium
* Drop myself from Uploaders.
[ Hideki Yamane ]
- * add css and images for HTML documents, borrowed from debian reference.
+ * add css and images for HTML documents, borrowed from Debian reference.
(Closes: #780787)
* not say "security NMU" but just say "upload" (Closes: #784244)
* just say wheezy as "Debian 7", instead of "7.0" (Closes: #784248)
@@ -131,7 +131,7 @@ developers-reference (3.4.14) unstable; urgency=medium
#494332
* Mention getting removed from e-mail aliases in retiring procedure.
Closes: #736232
- * Fix typos in german translation. Patch from Thomas Schumm (Thanks!).
+ * Fix typos in German translation. Patch from Thomas Schumm (Thanks!).
Closes: #686253
* Update DSA contact points. Closes: #713043
* Mention collab-maint in the VCS section. Closes: #496815
@@ -340,7 +340,7 @@ developers-reference (3.4.5) unstable; urgency=low
checklist for the sponsor. Closes: #453313
* Update the "Debian Developer's Duties" chapter to be more explicit
about duties of package maintainers. Closes: #548867
- * Update references to merkel (which is decommissionned) where
+ * Update references to merkel (which is decommissioned) where
needed. Closes: #619990
Thanks to Charles Plessy for the patch.
* Many typos fixed by Chris Leick <c.leick@vollbio.de>. Closes: #623512
@@ -385,7 +385,7 @@ developers-reference (3.4.4) unstable; urgency=low
<smcv@debian.org> for the patches:
- point to official names {ftp,ssh}.upload.debian.org. Closes: #554054
- drop references to non-working queues. Closes: #554077
- * Mention docbook, POD and reST as convenient formats to write new manual
+ * Mention DocBook, POD and reST as convenient formats to write new manual
pages. Thanks to Charles Plessy and the debian-mentors list
for the idea and the patch. Closes: #557298
* Update several sections to take into account the new source formats “3.0
@@ -450,8 +450,8 @@ developers-reference (3.4.2) unstable; urgency=low
upstreams. Closes: #523985.
* Applied patch from Charles Plessy about providing information to the
ftpmasters. Closes: #526410.
- * In the section about patch systems, mention quilt (wasn not
- mentionned before) and describe it as the recommended patch system.
+ * In the section about patch systems, mention quilt (was not
+ mentioned before) and describe it as the recommended patch system.
also mention dpatch and cdbs' patch system. drop dbs. Closes: #525668.
* Added a note in the wanna-build section to mention
http://release.debian.org/wanna-build.txt. Closes: #516375.
@@ -471,17 +471,17 @@ developers-reference (3.4.2) unstable; urgency=low
developers-reference (3.4.1) unstable; urgency=low
[ Raphael Hertzog ]
- * Create a publish target in the Makefile to reenable builds on the
+ * Create a publish target in the Makefile to re-enable builds on the
website.
[ Lucas Nussbaum ]
- * Commited DEP1: rework the whole NMU section.
+ * Committed DEP1: rework the whole NMU section.
The most important changes are:
- + NMUs are now explicitely allowed for all bugs, not just "serious bugs".
+ + NMUs are now explicitly allowed for all bugs, not just "serious bugs".
+ It is recommended to use the DELAYED queue, and some example delays are
provided.
Other fixes:
- + Describe the process of acknowleding NMUs in a way that works
+ + Describe the process of acknowledging NMUs in a way that works
with the BTS's version-tracking. Closes: #480723.
+ No longer mention that only DDs can do NMU. Don't make any
distinction. Closes: #464230.
@@ -526,7 +526,7 @@ developers-reference (3.4.0) unstable; urgency=low
Closes: #483225.
* README.contrib: document that short lines are preferred.
Closes: #278267.
- * build-rdeps allows to list reverse build-dependencies.
+ * build-rdeps allows one to list reverse build-dependencies.
Closes: #376582.
[ Marc 'HE' Brockschmidt ]
@@ -534,7 +534,7 @@ developers-reference (3.4.0) unstable; urgency=low
* In the same spirit, wrap all uses of stable/testing/unstable and
release codenames in <literal>
* Remove reference to upload queue on auric in section 5.6.5, auric
- doesn't exist anymore.
+ doesn't exist any more.
* Fix several typesetting errors and typos noticed by Sandro Tosi,
thanks for the notes! Closes: #483223
* Update several bits about release management/testing transitions
@@ -592,11 +592,11 @@ developers-reference (3.3.9) unstable; urgency=low
Closes: #401415
* Document Team-Maintainence better. Thanks, Lucas Nussbaum.
Closes: #410159
- * Add link to more removal ressources. Thanks, Adam D. Barratt,
+ * Add link to more removal resources. Thanks, Adam D. Barratt,
Justin Pryzby. Closes: #412757, #356720
* Repacking source packages need to be documented in copyright.
Thanks, Russ Allbery. Closes: #413320
- * Better describe version of debian native packages NMUs. Closes: #405818
+ * Better describe version of Debian native packages NMUs. Closes: #405818
* Source, HTML and text are now encoded in UTF-8. Thanks, Jörg Sommer.
Closes: #373816
* Source is now DocBook XML instead of debiandoc. Closes: #374220
@@ -604,7 +604,7 @@ developers-reference (3.3.9) unstable; urgency=low
[ Raphael Hertzog ]
* Add a link to enrico's excellent Debian Community Guidelines.
* Recommend the use of DSA's request tracker instead of mailing them.
- * Remove reference to #debian-sf, #debian-bsd which don't exist anymore. Put
+ * Remove reference to #debian-sf, #debian-bsd which don't exist any more. Put
a reference to #debian-dpkg instead.
* Remove all stuff concerning non-US.
* Update information concerning Alioth.
@@ -628,7 +628,7 @@ developers-reference (3.3.8) unstable; urgency=low
Closes: #376411
* better destinction between maintainer and developer. Thanks for
the suggestion to Colin Tuckley. Closes: #380458
- * irc.d.o points to oftc. Thanks, Christoph Biedl, Jon Dowland.
+ * irc.d.o points to OFTC. Thanks, Christoph Biedl, Jon Dowland.
Closes: #382721
* Bugs are now always closed thanks to version tracking.
Closes: #339552, #353447, #376199
@@ -681,7 +681,7 @@ developers-reference (3.3.7) unstable; urgency=low
- more about debconf-style translation. Thanks, Christian Perrier.
Closes: #309502
- non-us discontinued.
- - document nmu changes wrt version tracking. Thanks, Justin Pryzby.
+ - document NMU changes wrt version tracking. Thanks, Justin Pryzby.
Closes: #341197
- fix spelling issues. Thanks to various people.
Closes: #336146, #326857, #338660
@@ -724,7 +724,7 @@ developers-reference (3.3.6) unstable; urgency=low
- duplicate bug reports should be merged. Closes: #285381
- if you're on vacation, please check whether someone needs keysigning.
Closes: #285458
- - freenode has developer cloacks. Closes: #285687
+ - freenode has developer cloaks. Closes: #285687
- cleaned up uploaders / maintainer field
- explain how dak detects NMUs. Closes: #292354
- add "mass" to lots of bugs. Closes: #292946
@@ -742,10 +742,10 @@ developers-reference (3.3.5) unstable; urgency=low
- updated URL of vanilla rules files. Closes: #237557, #252048
- please speak with stable RM before uploading to stable. Closes: #261464
- information on wnpp usage synced with wnpp. Closes: #255298
- - spelling, grammer fixes.
+ - spelling, grammar fixes.
Closes: #202444, #202499, #203202, #203378, #221902, #226208
- - add hint about partitial key id. Closes: #243968
- - spohr is restriced, and also ftp-master. Closes: #255814
+ - add hint about partial key id. Closes: #243968
+ - spohr is restricted, and also ftp-master. Closes: #255814
- bpp: Hint about locale generation as non-root. Closes: #208021
- bpp: deborphan-compliant transition packages. Closes: #183654
- add myself to uploaders.
@@ -943,7 +943,7 @@ developers-reference (3.2.1) unstable; urgency=low
the document where these tools are discussed
- Sec "Overview of maintainer tools": add entries for sbuild,
build-essential, linda; improved entries for pbuilder, devscripts
- - Sec "Tools for porters" renamed and readapted to "Porting
+ - Sec "Tools for porters" renamed and re-adapted to "Porting
infrastructure and automation"; move tool discussion down to the
appendix; improve Sec "buildd" a bit
- README-contrib added giving information for authors, contributors,
@@ -1096,7 +1096,7 @@ developers-reference (3.0) unstable; urgency=low
Sec "Bug housekeeping" (new section, some parts stubbed out)
- new Chapter "Beyond Packaging" recommends ways to contribute
- to Debian beyond issues of package maintenance; incoporates
+ to Debian beyond issues of package maintenance; incorporates
Ch "Interaction with Prospective Developers", retitled to
Sec "Interacting with Prospective Debian Developers"
Sec "Submitting Bugs", renamed to "Reporting Bugs"
@@ -1198,7 +1198,7 @@ developers-reference (2.11) unstable; urgency=low
- update French translation
* Martin Michlmayr:
- changes in upload situation, not possible to remove from Incoming
- anymore; closes: #135559
+ any more; closes: #135559
- also talk about dput a tiny bit
* Adam Di Carlo:
- Ch "Overview of Debian Maintainer Tools":
@@ -1236,7 +1236,7 @@ developers-reference (2.10.0) unstable; urgency=low
closes: #133953
- fix some typos, closes: #133956
* Adam Di Carlo:
- - frozen doesn't exist anymore, just testing; note, however, that
+ - frozen doesn't exist any more, just testing; note, however, that
there is a way to upload to 'woody-proposed-updates' -- if I can
find some description of that, I'll document it; closes: #133948
- minor build tweaks
@@ -1302,7 +1302,7 @@ developers-reference (2.8.6) unstable; urgency=low
* fix a typo, thanks to Antoine Hulin
* French version: completely up-to-date now
* Makefile: add a 'validate' target
- * prepare and ship "upstream" ChangeLog; move the debian changelog to
+ * prepare and ship "upstream" ChangeLog; move the Debian changelog to
changelog.Debian.gz
* all versions: change the email address to use when orphaning
closes: #93727
@@ -1411,7 +1411,7 @@ developers-reference (2.8.0) unstable; urgency=low
better
* other small corrections
* fixed orphaning/adopting instructions with regard to the new WNPP
- * common.ent: fix urls for cvs.d.o, wnpp, Debian machines page,
+ * common.ent: fix URLs for cvs.d.o, wnpp, Debian machines page,
lists-archives, www.d.o BTS
* common.ent: changed link for machines from devel/maintainer_contacts
to the db.d.o CGI
@@ -1475,7 +1475,7 @@ developers-reference (2.7.1) unstable; urgency=low
developers-reference (2.7.0) unstable; urgency=low
- * developers-reference.sgml: separated out language-independant elements
+ * developers-reference.sgml: separated out language-independent elements
into common.ent (not content changes); misc minor grammar changes
throughout
* doc-base: change section for *constitution* to Debian (not 'debian')
@@ -1539,7 +1539,7 @@ developers-reference (2.6.6) unstable; urgency=low
* Secs. "Uploads via chiark" and "Uploads via erlangen": remove
'cron-driven' (thanks Roman Hodek)
* Sec. "Being Kind to Porters": typos corrected, note that binary-arch
- and binary-indep targets should work independantly (thanks Roman
+ and binary-indep targets should work independently (thanks Roman
Hodek)
* Sec. "buildd": remove erroneous reference to debbuild, reorganize the
section and correct typos (thank again Roman -- boy, this is the all
@@ -1572,7 +1572,7 @@ developers-reference (2.6.5) unstable; urgency=low
developers-reference (2.6.4) unstable; urgency=low
- * debian/rules: hack 'byhand' file entries to include debian version
+ * debian/rules: hack 'byhand' file entries to include Debian version
number in it, so subsequent uploads of the package into Incoming don't
step all over each other
@@ -1685,7 +1685,7 @@ developers-reference (2.5.0.2) frozen unstable; urgency=low
* maintainer name change (but it's still me)
* Ch. "Non-Maintainer Uploads (NMUs) and Porters": new chapter
discussing NMUs and porters; Section "Interim Releases" integrated out
- of existance. New TOC for this section is:
+ of existence. New TOC for this section is:
* 6 Non-Maintainer Uploads (NMUs) and Porters
+ 6.1 Who can do a port or an NMU
+ 6.2 When to do a port or an NMU
@@ -1714,7 +1714,7 @@ developers-reference (2.5.0.2) frozen unstable; urgency=low
* show *full* TOC, including sect2
* of course the obligatory typo, grammar, and spelling corrections
- * Makefile: small changes to accomodate DDP autobuild
+ * Makefile: small changes to accommodate DDP autobuild
* debian/dirs: obsolete, removed
* debian/rules: use changelog date for SGML timestamping, not current date
@@ -1843,7 +1843,7 @@ developers-reference (2.4.1.3) unstable; urgency=low
* debian/rules: better abstraction and organization
* reformat SGML like I happen to like it
* utilize the new URL tag
- * build PostScript on letter size, I hear thats better for A4 and US
+ * build PostScript on letter size, I hear that's better for A4 and US
letter printing
-- Adam P. Harris <aph@debian.org> Thu, 16 Jul 1998 00:52:35 -0400
@@ -1857,7 +1857,7 @@ developers-reference (2.4.1.2) frozen unstable; urgency=low
reference won't win us many friends in hamm, and after all, it's just
text, it can't hurt you.)
* no content changes, except that the version number in the SGML file
- reflect this packages version number
+ reflect this package's version number
* debian/rule: clean is cleaner now
-- Adam P. Harris <aph@debian.org> Tue, 16 Jun 1998 01:35:39 -0400
@@ -1900,7 +1900,7 @@ developers-reference (0.5) unstable; urgency=low
- Changed section 1.2 Registering as a Debian developer:
+ signatures from formal certification service are _NOT_ accepted
- anymore
+ any more
+ images of ID documents have to be PGP or RSA signed
(as requested by James Troup)
@@ -1945,7 +1945,7 @@ developers-reference (0.3) unstable; urgency=low
- Generating the changes file (for uploads)
- Announcing package uploads
* New section about Debian Mentors
- * debian/rules: Don't use debstd anymore
+ * debian/rules: Don't use debstd any more
* debian/rules: Compress changelog file (fixes:#15441)
* Fixed link to WNPP list (fixes:#16201)
* Added menu entry (fixes:#15708)
diff --git a/new-maintainer.dbk b/new-maintainer.dbk
index d79892a..6b2ced9 100644
--- a/new-maintainer.dbk
+++ b/new-maintainer.dbk
@@ -10,7 +10,7 @@
<para>
So, you've read all the documentation, you've gone through the <ulink
url="&url-newmaint-guide;">Debian New Maintainers' Guide</ulink> (or its
-sucessor, <ulink url="&url-debmake-doc;">Guide for Debian Maintainers</ulink>),
+successor, <ulink url="&url-debmake-doc;">Guide for Debian Maintainers</ulink>),
understand what everything in the <systemitem role="package">hello</systemitem>
example package is for, and you're about to
Debianize your favorite piece of software. How do you actually become a Debian
diff --git a/pkgs.dbk b/pkgs.dbk
index 8948019..17c42e3 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1929,7 +1929,7 @@ please see the top of the file for whom to contact for changes.
Please note that it is insufficient to only add your package to
<filename>Packages-arch-specific</filename> without making it fail to build on unsupported
architectures: A porter or any other person trying to build your package might
-accidently upload it without noticing it doesn't work. If in the past some
+accidentally upload it without noticing it doesn't work. If in the past some
binary packages were uploaded on unsupported architectures, request their
removal by filing a bug against <systemitem
role="package">ftp.debian.org</systemitem>.
@@ -2050,7 +2050,7 @@ While preparing the patch, you should better be aware of any package-specific
practices that the maintainer might be using. Taking them into account
reduces the burden of integrating your changes into the normal package
workflow and thus increases the chances that integration will happen. A good
-place where to look for for possible package-specific practices is
+place where to look for possible package-specific practices is
<ulink url="&url-debian-policy;ch-source.html#s-readmesource"><filename>debian/README.source</filename></ulink>.
</para>
<para>
@@ -2118,7 +2118,7 @@ defend the wisdom of any NMU you perform on its own merits.
<para>
Just like any other (source) upload, NMUs must add an entry to
<filename>debian/changelog</filename>, telling what has changed with this
-upload. The first line of this entry must explicitely mention that this upload is an NMU, e.g.:
+upload. The first line of this entry must explicitly mention that this upload is an NMU, e.g.:
</para>
<screen>
* Non-maintainer upload.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/developers-reference.git
Reply to: