diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-23 06:19:35 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-23 06:19:35 +0100 |
| commit | eb78533248031499c1c1fc16434d18782285ba2f (patch) | |
| tree | abc7220ebb0675850670d17a5deacde62bd3c18c | |
| parent | 0bd97ec81ea627866453bd6ccf861127967a8ad6 (diff) | |
Policy: doc-base now optional, not recommended
Wording: Sean Whitton <spwhitton@spwhitton.name>
Seconded: Russ Allbery <rra@debian.org>
Seconded: Ansgar Burchardt <ansgar@debian.org>
Closes: #910783
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | policy/ch-customized-programs.rst | 5 | ||||
| -rw-r--r-- | policy/ch-opersys.rst | 10 | ||||
| -rw-r--r-- | policy/upgrading-checklist.rst | 3 |
4 files changed, 15 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 41b2e76..c59d387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,11 @@ debian-policy (4.4.1.0) UNRELEASED; urgency=medium Seconded: Russ Allbery <rra@debian.org> Seconded: Simon McVittie <smcv@debian.org> Closes: #919507 + * Policy: doc-base now optional, not recommended + Wording: Sean Whitton <spwhitton@spwhitton.name> + Seconded: Russ Allbery <rra@debian.org> + Seconded: Ansgar Burchardt <ansgar@debian.org> + Closes: #910783 -- Sean Whitton <spwhitton@spwhitton.name> Mon, 15 Jul 2019 19:02:20 +0100 diff --git a/policy/ch-customized-programs.rst b/policy/ch-customized-programs.rst index 529aa66..dbba4fc 100644 --- a/policy/ch-customized-programs.rst +++ b/policy/ch-customized-programs.rst @@ -151,9 +151,8 @@ web servers and web applications in the Debian system. Web Applications should try to avoid storing files in the Web Document Root. Instead they should use the /usr/share/doc/package - directory for documents and register the Web Application via the - doc-base package. If access to the web document root is unavoidable - then use + directory for documents. If access to the web document root is + unavoidable then use :: diff --git a/policy/ch-opersys.rst b/policy/ch-opersys.rst index 59c9893..3e685cf 100644 --- a/policy/ch-opersys.rst +++ b/policy/ch-opersys.rst @@ -976,11 +976,11 @@ Here is an example of a wrapper script for this purpose: Registering Documents using doc-base ------------------------------------ -The doc-base package implements a flexible mechanism for handling and -presenting documentation. The recommended practice is for every Debian -package that provides online documentation (other than just manual -pages) to register these documents with doc-base by installing a -doc-base control file in ``/usr/share/doc-base/``. +The doc-base package implements a mechanism for handling and +presenting documentation. Debian packages that provides online +documentation (other than just manual pages) may register these +documents with doc-base by installing a doc-base control file in +``/usr/share/doc-base/``. Please refer to the documentation that comes with the doc-base package for information and details. diff --git a/policy/upgrading-checklist.rst b/policy/upgrading-checklist.rst index d19450b..c59981b 100644 --- a/policy/upgrading-checklist.rst +++ b/policy/upgrading-checklist.rst @@ -52,6 +52,9 @@ Unreleased. the maintainer should specify the one that they would prefer other people to use as the basis for proposing changes to the package. +9.10 & 11.5 + doc-base registration is now optional, from being recommended. + Version 4.4.0 ------------- |