From: Russ Allbery Date: Sat, 14 Feb 2009 03:39:14 +0000 (-0800) Subject: Change distribution area to archive area X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5debacd21c07bea2f7a5c5046ad82fbf8edc6a1e;p=debian%2Fdebian-policy.git Change distribution area to archive area Also reword the footnote about the Social Contract language slightly. --- diff --git a/policy.sgml b/policy.sgml index 9b9ee4c..5ecda02 100644 --- a/policy.sgml +++ b/policy.sgml @@ -318,13 +318,11 @@ system, but not every package we want to make accessible is free in our sense (see the Debian Free Software Guidelines, below), or may be imported/exported without - restrictions. Thus, the archive is split into the distribution - areas or components + restrictions. Thus, the archive is split into areas The Debian archive software uses the term "component" internally and in the Release file format to refer to the division of an - archive. The Debian Social Contract refers to distribution - areas. This document uses the same terminology as the Social - Contract. + archive. The Debian Social Contract simply refers to "areas." + This document uses terminology similar to the Social Contract. based on their licenses and other restrictions.

@@ -342,12 +340,12 @@

- The main distribution area forms the Debian GNU/Linux + The main archive area forms the Debian GNU/Linux distribution.

- Packages in the other distribution areas (contrib, + Packages in the other archive areas (contrib, non-free) are not considered to be part of the Debian distribution, although we support their use and provide infrastructure for them (such as our bug-tracking system and @@ -454,10 +452,10 @@ - Distribution areas + Archive areas - The main distribution area + The main archive area

Every package in main must comply with the DFSG @@ -488,7 +486,7 @@ - The contrib distribution area + The contrib archive area

Every package in contrib must comply with the DFSG. @@ -528,7 +526,7 @@ - The non-free distribution area + The non-free archive area

Packages must be placed in non-free if they are @@ -644,18 +642,18 @@ Sections

- The packages in the distribution areas main, - contrib and non-free are grouped further - into sections to simplify handling. + The packages in the archive areas main, + contrib and non-free are grouped further into + sections to simplify handling.

- The distribution area and section for each package should be - specified in the package's Section control record - (see ). However, the maintainer of the - Debian archive may override this selection to ensure the - consistency of the Debian distribution. The - Section field should be of the form: + The archive area and section for each package should be + specified in the package's Section control record (see + ). However, the maintainer of the Debian + archive may override this selection to ensure the consistency of + the Debian distribution. The Section field should be + of the form: section if the package is in the @@ -9012,10 +9010,10 @@ install-info --quiet --remove /usr/share/info/foobar.info

- Packages in the contrib or non-free - distribution areas should state in the copyright file that the - package is not part of the Debian GNU/Linux distribution and - briefly explain why. + Packages in the contrib or non-free archive + areas should state in the copyright file that the package is not + part of the Debian GNU/Linux distribution and briefly explain + why.