From 921dfa2b3c8ef9f48bb01881f527191053e7a39b Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:09:55 +0000 Subject: [PATCH] * Corrected typos and grammatical errors found by Sean Perry Author: jdg Date: 2001/02/13 16:21:14 * Corrected typos and grammatical errors found by Sean Perry closes: Bug#85501, #85504, #85505, #85506 closes: Bug#85508, #85510, #85511, #85514 git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-79 --- debian/changelog | 5 ++++- policy-process.sgml | 4 ++-- policy.sgml | 51 +++++++++++++++++++++++---------------------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index addbf58..32ad33f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ debian-policy (3.5.0.1) unstable; urgency=low - * Removed deprecated virtual package names closes: #84641 + * Removed deprecated virtual package names closes: Bug#84641 * Changed rmdir postrm example (suggestion on -policy list) * Removed Richard Braakman from list of maintainers at his request + * Corrected typos and grammatical errors found by Sean Perry + closes: Bug#85501, #85504, #85505, #85506 + closes: Bug#85508, #85510, #85511, #85514 -- diff --git a/policy-process.sgml b/policy-process.sgml index ad91055..d4c4e20 100644 --- a/policy-process.sgml +++ b/policy-process.sgml @@ -7,7 +7,7 @@ Manoj Srivastava srivasta@debian.org - $Revision: 1.1 $ + $Revision: 1.2 $ Copyright © 2000 by Manoj Srivastava. @@ -131,7 +131,7 @@ dead. If six months have actually passed, the bug should be retitled "[OLD PROPOSAL] ...", and have the severity set to fixed. The maintianers shall flush out old - proposal after a a suuficiently long period of time + proposal after a a sufficiently long period of time (cetainly more than a year or so).

diff --git a/policy.sgml b/policy.sgml index dd39e81..6680d8e 100644 --- a/policy.sgml +++ b/policy.sgml @@ -1359,10 +1359,10 @@

They must be at least two characters long and must start - with an alphanumeric character. The use lowercase package - names is strongly recommended unless the package you're - building (or referring to, in other fields) is already - using uppercase.

+ with an alphanumeric character. The use of lowercase + package names is strongly recommended unless the package + you're building (or referring to, in other fields) is + already using uppercase.

Version @@ -1379,11 +1379,11 @@ id="f-Standards-Version">Standards-Version -

- The most recent version of the standards (the packaging - and policy manuals and associated texts) with which the - package complies. This is updated manually when editing - the source package to conform to newer standards; it can +

+ The most recent version of the standards (the policy + manual and associated texts) with which the package + complies. This is updated manually when editing the + source package to conform to newer standards; it can sometimes be used to tell when a package needs attention.

@@ -1543,8 +1543,8 @@

- This is the main part of the version. It is usually - version number of the original (`upstream') package of + This is the main part of the version. It is usually the + version number of the original (`upstream') package from which the .deb file has been made, if this is applicable. Usually this will be in the same format as that specified by the upstream author(s); however, it @@ -1741,9 +1741,10 @@ package, all required targets MUST be non-interactive. At a minimum, required targets are the ones called by dpkg-buildpackage, namely, - clean, binary, binary-arch, and - build. It also follows that any target that these - targets depend on must also be non-interactive. + clean, binary, binary-arch, + binary-indep, and build. It also follows + that any target that these targets depend on must also be + non-interactive.

@@ -1952,9 +1953,9 @@

It is important to understand that the DEB_*_ARCH - string does only determine which Debian architecture we - build on resp. for. It should not be used to get the CPU - or System information, the GNU style variables should be + string only determines which Debian architecture we are + building on or for. It should not be used to get the CPU + or system information; the GNU style variables should be used for that.

@@ -2271,11 +2272,11 @@ control area of the package. They must be proper executable files; if they are scripts (which is recommended) they must start with the usual #! convention. They should be - readable and executable to anyone, and not world-writable. + readable and executable by anyone, and not world-writable.

- the package management system looks at the exit status from + The package management system looks at the exit status from these scripts. It is important that they exit with a non-zero status if there is an error, so that the package management system can stop its processing. For shell @@ -2496,18 +2497,18 @@

The procedure on installation/upgrade/overwrite/disappear (i.e., when running dpkg --unpack, or the unpack - stage of dpkg - --install) is as follows. In each case if an error occurs the - actions in are general run backwards - this means that the maintainer - scripts are run with different arguments in reverse order. These are - the `error unwind' calls listed below. + stage of dpkg --install) is as follows. In each + case if an error occurs the actions are, in general, run + backwards - this means that the maintainer scripts are run + with different arguments in reverse order. These are the + `error unwind' calls listed below.

-

If a version the package is already +

If a version of the package is already installed, call old-prerm upgrade new-version -- 2.39.2