From d92ace86279772065fbafda4e452e92322c51332 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:11:03 +0000 Subject: [PATCH] * Typos in various documents Author: jdg Date: 2001/04/13 00:10:17 * Typos in various documents * Allow both "[PROPOSAL] ..." and "[PROPOSED] ..." titles in bug reports (which is current practice) * Package now generates .txt files instead of .text files git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-92 --- debian/changelog | 2 ++ debian/rules | 32 +++++++++++----------- menu-policy.sgml | 2 +- mime-policy.sgml | 4 +-- policy-process.sgml | 67 +++++++++++++++++++++++---------------------- policy.sgml | 8 +++--- 6 files changed, 60 insertions(+), 55 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca4673b..6f776e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ debian-policy (3.5.2.1) unstable; urgency=low * Also install FHS stuff byhand (as requested by webmasters) * Corrected GPL name and location closes: Bug#88788, #93047 * Correct bug severities closes: Bug#91276 + * Correct typos etc. in policy-process + * Rename all .text files as .txt -- diff --git a/debian/rules b/debian/rules index b57e5c0..52161c9 100755 --- a/debian/rules +++ b/debian/rules @@ -40,10 +40,10 @@ version := $(shell LC_ALL=C dpkg-parsechangelog | \ FILES_TO_CLEAN = debian/files debian/buildinfo debian/substvars \ debian/postinst debian/prerm \ version.ent policy.lout policy.lout.ld lout.li \ - upgrading-checklist.text policy.text.gz \ - menu-policy.text.gz menu-policy.pdf.gz \ - policy-process.text.gz policy-process.pdf.gz \ - mime-policy.text.gz mime-policy.pdf.gz \ + upgrading-checklist.txt policy.txt.gz \ + menu-policy.txt.gz menu-policy.pdf.gz \ + policy-process.txt.gz policy-process.pdf.gz \ + mime-policy.txt.gz mime-policy.pdf.gz \ debconf_spec/debconf_specification.html \ debconf_spec/debconf_specification.txt.gz \ @@ -70,16 +70,16 @@ FHS_HTML =fhs-2.1.html.tar.gz FHS_FILES =fhs/fhs.ps fhs/fhs.txt fhs/fhs.pdf FHS_BYHAND =fhs-2.1.html.tar.gz fhs/fhs.txt # FSSTND_FILES =FSSTND-FAQ fsstnd-1.2.dvi.gz fsstnd-1.2.ps.gz fsstnd-1.2.txt.gz -POLICY_FILES =policy.text.gz policy.sgml virtual-package-names-list.text \ - upgrading-checklist.text libc6-migration.text version.ent \ - menu-policy.sgml menu-policy.text.gz \ - mime-policy.sgml mime-policy.text.gz \ - policy-process.text.gz policy-process.sgml \ +POLICY_FILES =policy.txt.gz policy.sgml virtual-package-names-list.txt \ + upgrading-checklist.txt libc6-migration.txt version.ent \ + menu-policy.sgml menu-policy.txt.gz \ + mime-policy.sgml mime-policy.txt.gz \ + policy-process.txt.gz policy-process.sgml \ debconf_spec/debconf_specification.html \ debconf_spec/debconf_specification.txt.gz -BYHAND_FILES =policy.text.gz libc6-migration.text \ - virtual-package-names-list.text menu-policy.text.gz \ - mime-policy.text.gz policy.ps.gz policy.pdf.gz \ +BYHAND_FILES =policy.txt.gz libc6-migration.txt \ + virtual-package-names-list.txt menu-policy.txt.gz \ + mime-policy.txt.gz policy.ps.gz policy.pdf.gz \ policy.html.tar.gz \ debconf_spec/debconf_specification.txt.gz \ $(FHS_BYHAND) @@ -100,8 +100,8 @@ stamp-build: nsgmls -gues $$file.sgml; \ debiandoc2html $$file.sgml; \ debiandoc2text $$file.sgml; \ - if [ -f $$file.txt ]; then mv $$file.txt $$file.text; fi; \ - gzip -9f $$file.text; \ + if [ -f $$file.text ]; then mv $$file.text $$file.txt; fi; \ + gzip -9f $$file.txt; \ done tar zfx $(FHS_ARCHIVE) # Need to use a patched tmac.m macro file if we're using a pre-1.16 @@ -113,10 +113,10 @@ stamp-build: # The extra '.' in the tmac path doesn't matter if GROFF_TMAC_PATH=. cd fhs && $(MAKE) fhs.ps fhs.pdf fhs.txt links -dump fhs-changes-2.1.html | perl -pe 's/[\r\0]//g' > \ - fhs/fhs-changes-2.1.text + fhs/fhs-changes-2.1.txt cd fhs && tar zfx ../$(FHS_HTML) links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \ - upgrading-checklist.text + upgrading-checklist.txt $(MAKE) -C debconf_spec all gzip -9f debconf_spec/debconf_specification.txt touch stamp-build diff --git a/menu-policy.sgml b/menu-policy.sgml index 3c7dd4d..9fc53b3 100644 --- a/menu-policy.sgml +++ b/menu-policy.sgml @@ -85,7 +85,7 @@ /usr/doc/copyright/GPL in the Debian GNU/Linux distribution or on the World Wide Web at . You can also obtain it by writing to the + name="The GNU General Public Licence">. You can also obtain it by writing to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

diff --git a/mime-policy.sgml b/mime-policy.sgml index 53ba2cc..9713c68 100644 --- a/mime-policy.sgml +++ b/mime-policy.sgml @@ -77,7 +77,7 @@ /usr/share/common-licenses/GPL in the Debian GNU/Linux distribution or on the World Wide Web at . You can also obtain it by writing to the + name="The GNU General Public Licence">. You can also obtain it by writing to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

@@ -133,7 +133,7 @@ name="update-mime" section="8">. They should not depend on, recommend, or suggest mime-support. Instead, they should just put something like the following in the - postinst and postrm scripts: + postinst and postrm scripts: if [ -x /usr/sbin/update-mime ]; then diff --git a/policy-process.sgml b/policy-process.sgml index d4c4e20..15eb7c7 100644 --- a/policy-process.sgml +++ b/policy-process.sgml @@ -7,7 +7,7 @@ Manoj Srivastava srivasta@debian.org - $Revision: 1.2 $ + $Revision: 1.3 $ Copyright © 2000 by Manoj Srivastava. @@ -19,7 +19,7 @@

On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in - `/usr/share/common-licenses/GPL'.

+ /usr/share/common-licenses/GPL.

@@ -50,7 +50,7 @@ Debian developers.

A copy of this document should also be found at

+ id="http://master.debian.org/~srivasta/policy/">

 Archives and Personnel @@ -63,15 +63,15 @@ rather than authors/editors. This group does not create policy, nor does it exercise editorial control, Policy is decided "upstream". The group that decides on policy should - be the group of developers on the Debian-policy mailing - lists, which is how it was always done; so the group of + be the group of developers on the debian-policy mailing + list, which is how it was always done; so the group of policy maintainers have no real power over policy.

Since the policy maintainers have no special powers, there is no restriction of their participattion the discussion. It - is preferable to have atleast 4-5 people on the job, - perhapscloser to 8, so that policy does not languish when + is preferable to have at least 4-5 people on the job, + perhaps closer to 8, so that policy does not languish when any maintainer goes missing (we do need vacations, you know, once in a while), and since little creative power is vested in the maintainers, we do not need a central control. And @@ -85,7 +85,7 @@ There is a repository set up on cvs.debian.org for this, and the people on the policy maintainer team have write access to it. The Debian policy mailing list gets - copies of all the CVS commit notices + copies of all the CVS commit notices.

@@ -118,26 +118,28 @@

Any Debian developer can create a proposal by retitling the wishlist bug in the BTS to have the subject of the form - "[PROPOSED] ...". (Note: The developer may + "[PROPOSED] ..." or + "[PROPOSAL] ...". (Note: The developer may coalesce these steps into one by directly filing a - wishlist bug with the proper seubject format). + wishlist bug with the proper subject format).

- This is the pre discussion period, when the idea is kicked + This is the pre-discussion period, when the idea is kicked around, and polished. There is no preset time limit, but at some point, if it is stalled, the bug should be closed. A suggested time period is 6 months, since if the proposal has had no action in that period, it is very likely 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 sufficiently long period of time - (cetainly more than a year or so). + severity set to fixed. The maintainers shall flush out old + proposals after a a sufficiently long period of time has + elapsed (certainly more than a year or so after the initial + proposal).

- developers may second the issue by emailing "seconded" - to the BTS. Only registered Debian developers may - second proposals. + Developers may second the issue by emailing a message + containing the text "seconded" to the proposal in the + BTS. Only registered Debian developers may second proposals.

@@ -146,7 +148,7 @@ When a proposal in the BTS has acquired two seconds (apart from the proposer), it becomes a formal amendment. The bug severity is raised to "normal" and the bug is retitled to - "[AMENDMENT DD/MM/YYY] ...". + "[AMENDMENT DD/MM/YYYY] ...".

The rationale behind the requirement for seconders is that @@ -160,14 +162,14 @@

Prevent frivolous or ill conceived proposals from - wasting peoples time (If the proposal does not even + wasting peoples time (if the proposal does not even convince two developers, surely this is not ready for inclusion in Policy?)

- The whole discussion process is meant to be light weight; If + The whole discussion process is meant to be lightweight; if you wish the proposals to be amended, talk to the proposer, and get the amendment in. Or else, post an alternative, and let the group decide which one is better. @@ -184,8 +186,8 @@

This document is not supposed to supplant the processes - outlined in the constitution, nor is it an end run around - them. + outlined in the constitution, nor is it intended to run + around them.

@@ -194,15 +196,16 @@ An accepted amendment

- if the amendment is accepted, the bug is marked - forwarded and retitled "[ACCEPTED DD/MM/YYY]...". + If the amendment is accepted, the bug is marked + forwarded and retitled + "[ACCEPTED DD/MM/YYYY] ...".

An amendment that stalls or is rejected

- if the amendment is stalls, or otherwise fails to pass, it - is retitled as "[REJECTED DD/MM/YYY] ..." + If the amendment is stalls, or otherwise fails to pass, it + is retitled as "[REJECTED DD/MM/YYYY] ..." and has its severity set to fixed.

@@ -213,10 +216,10 @@ Deadlines for Tabling Discussions

It has been observed in the past that discussions on the - mailing list devolve into endless arguments. In order to get - away from the debating society aspect, at the time of the - formal proposal, a deadline can be set (probably by the - proposer, since they are likely to have an idea how + mailing list tend to devolve into endless arguments. In + order to get away from the debating society aspect, at the + time of the formal proposal, a deadline can be set (probably + by the proposer, since they are likely to have an idea how contentious the discussion is likely to be) for ending discussion on the issue, which should rarely be less than 10 days, and typically two weeks or so. I hope that a hard @@ -232,7 +235,7 @@ Extensions to Deadlines?

- If a deadline is approaching, and the discussion s almost + If a deadline is approaching, and the discussion is almost concluded (in other words, it has not reached an impasse), and the consensus on the policy group is that an extension of a week would resolve the issues better, a one-time @@ -275,7 +278,7 @@

However, if the issue is non-technical and subjective, then a vote of the developers may be taken (USENET voting - software should be available all over the place, right?); + software should be available all over the place, right?), and a super-majority of 75% is needed to carry the amendment through. Failing the super-majority, the issue should be shelved. It may be re-submitted as a a fresh diff --git a/policy.sgml b/policy.sgml index ecf7ca0..795974e 100644 --- a/policy.sgml +++ b/policy.sgml @@ -205,7 +205,7 @@ The current version of this document is always accessible from the Debian FTP server ftp.debian.org as - /debian/doc/package-developer/policy.text.gz + /debian/doc/package-developer/policy.txt.gz (also available from the same directory are several other formats: policy.html.tar.gz, policy.pdf.gz and policy.ps.gz) or from the ftp.debian.org in - /debian/doc/package-developer/virtual-package-names-list.text + /debian/doc/package-developer/virtual-package-names-list.txt or your local mirror. In addition, it is included in the debian-policy package. The procedure for updating the list is described at the top of the file.

@@ -4745,7 +4745,7 @@

Menu entries should follow the current menu policy as defined in the file ftp.debian.org in - /debian/doc/package-developer/menu-policy.text.gz + /debian/doc/package-developer/menu-policy.txt.gz or your local mirror. In addition, it is included in the debian-policy package.

@@ -4781,7 +4781,7 @@ compose, edit or print MIME types should register themselves as such following the current MIME support policy as defined in the file found on ftp.debian.org in - /debian/doc/package-developer/mime-policy.text.gz + /debian/doc/package-developer/mime-policy.txt.gz or your local mirror. In addition, it is included in the debian-policy package.

-- 2.39.2