diff options
author | P. J. McDermott <pjm@nac.net> | 2012-08-12 16:20:54 (EDT) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-08-12 16:20:54 (EDT) |
commit | 75f6503ff4f8ee6eca94c26545982129245642f9 (patch) | |
tree | af8a3b58b7a23b2a21c23c70665461eb780f0ae2 | |
parent | c78c2e9a8b0bae8957e1d81367deac053ca92fbc (diff) |
Update SIP documents.
* Remove document titles.
* Add section IDs to headings.
* Use Unicode en dash instead of "--".
* Use MarkdownBook's "sectlink" macro.
-rw-r--r-- | policies/inclusion/about.mdwn | 23 | ||||
-rw-r--r-- | policies/inclusion/chapters | 6 | ||||
-rw-r--r-- | policies/inclusion/legal.mdwn | 62 | ||||
-rw-r--r-- | policies/inclusion/source.mdwn | 11 |
4 files changed, 49 insertions, 53 deletions
diff --git a/policies/inclusion/about.mdwn b/policies/inclusion/about.mdwn index 0b568f4..08d4600 100644 --- a/policies/inclusion/about.mdwn +++ b/policies/inclusion/about.mdwn @@ -1,8 +1,5 @@ -Title: About this Manual - - -Scope -===== +Scope [scope] +============= This manual describes certain legal and technical policy requirements that apply to all software included in this distribution. @@ -12,11 +9,11 @@ Nor does it describe any aspects of the operating system as a whole, including the filesystem hierarchy, system users, file modes, or service scripts. -Rationale -========= +Rationale [rationale] +===================== -Legal Distribution ------------------- +Legal Distribution [legal-distrib] +---------------------------------- These requirements ensure that each package may be distributed individually or as part of a complete operating system, with or without charge, by anyone. This @@ -27,8 +24,8 @@ in part, in their products. It also means that users who receive copies of this operating system or its packages are legally allowed to redistribute copies of the software they possess. -Software Freedom ----------------- +Software Freedom [sw-freedom] +----------------------------- These requirements ensure that users and vendors have certain rights in the software they use and distribute. Specifically, for each software package in @@ -40,8 +37,8 @@ For more information on software freedom and the rights of users and distributors of free, libre, and open-source software, see the [Free Software Definition][fsd]. -Effective Support ------------------ +Effective Support [support] +--------------------------- These requirements ensure that distribution maintainers are able to effectively support the software packages for which they are responsible. Specifically, diff --git a/policies/inclusion/chapters b/policies/inclusion/chapters index f1dd581..39307aa 100644 --- a/policies/inclusion/chapters +++ b/policies/inclusion/chapters @@ -1,3 +1,3 @@ -about -legal -source +about About this Manual +legal Legal Terms +source Source Code diff --git a/policies/inclusion/legal.mdwn b/policies/inclusion/legal.mdwn index f563e02..4079f14 100644 --- a/policies/inclusion/legal.mdwn +++ b/policies/inclusion/legal.mdwn @@ -1,8 +1,5 @@ -Title: Legal Terms - - -Copyrights and Licensing -======================== +Copyrights and Licensing [copyrights] +===================================== To be included in this distribution, a software package must either be free of any copyright interests (i.e. exist in the "public domain") or be accompanied by @@ -15,14 +12,19 @@ A "free" license is one that is classified as free by at least one of the following resources and is not classified as non-free by any of the following resources: - * [Free Software Foundation, Inc.'s License List][] - * [List of Licenses Approved by the Fedora Project][] - * [List of Licenses Approved by the Open Source Initiative][] - * [List of Licenses that Meet the Debian Free Software Guidelines][] - * [List of Licenses that Meet the Definition of Free Cultural Works][] + * Free Software Foundation, Inc.'s License List, as defined in + $[sectlink][res-fsf-ll] + * List of Licenses Approved by the Fedora Project, as defined in + $[sectlink][res-fedora-approved] + * List of Licenses Approved by the Open Source Initiative, as defined in + $[sectlink][res-osi-approved] + * List of Licenses that Meet the Debian Free Software Guidelines, as defined + in $[sectlink][res-dfsg-free] + * List of Licenses that Meet the Definition of Free Cultural Works, as defined + in $[sectlink][res-dfcw-ll] -These resources and their license classifications are described under [License -Classification Resources][]. +These resources and their license classifications are described under License +Classification Resources, $[sectlink][lic-class-res]. Licenses that are not classified in any way by any of the above resources shall be reviewed individually. Such licenses may be considered "free" under this @@ -35,13 +37,13 @@ policy provided they meet the requirements of the following definitions: * The [Definition of Free Cultural Works][dfcw], as maintained by Erik Möller and Benjamin Mako Hill -License Classification Examples -------------------------------- +License Classification Examples [lic-class-ex] +---------------------------------------------- Version 1.0 of the Artistic License is listed as a license that meets the Debian Free Software Guidelines. However, Free Software Foundation, Inc. lists the -license as non-free. At least one resource lists it as non-free, so -- even -though at least one resource lists it as free -- Artistic License version 1.0 is +license as non-free. At least one resource lists it as non-free, so – even +though at least one resource lists it as free – Artistic License version 1.0 is considered non-free according to this policy. The Free Art License is categorized as free on Free Software Foundation, Inc.'s @@ -63,11 +65,11 @@ approved licenses list, and the list of licenses that meet the Debian Free Software Guidelines. -License Classification Resources -================================ +License Classification Resources [lic-class-res] +================================================ -Free Software Foundation, Inc.'s License List ---------------------------------------------- +Free Software Foundation, Inc.'s License List [res-fsf-ll] +---------------------------------------------------------- Free Software Foundation, Inc. (FSF) is a non-profit organization incorporated in the United States of America. The FSF has published a document titled @@ -89,8 +91,8 @@ under the following categories are considered non-free by this resource: * Nonfree Documentation Licenses * Licenses for Works of Opinion and Judgment -List of Licenses Approved by the Fedora Project ------------------------------------------------ +List of Licenses Approved by the Fedora Project [res-fedora-approved] +--------------------------------------------------------------------- The Fedora Project is the community that develops the Fedora GNU/Linux distribution, sponsored by Red Hat, Inc. The Fedora Project maintains a @@ -114,8 +116,8 @@ under the following categories are considered non-free by this resource: * Content Licenses, Bad Licenses * Font Licenses, Bad Licenses -List of Licenses Approved by the Open Source Initiative -------------------------------------------------------- +List of Licenses Approved by the Open Source Initiative [res-osi-approved] +-------------------------------------------------------------------------- The Open Source Initiative (OSI) is a non-profit organization incoroporated in the United States of America. The OSI has published the Open Source Definition, @@ -126,8 +128,8 @@ label via its License Review Process. For the purposes of this policy, all licenses listed in the referenced document are considered free by this resource. -List of Licenses that Meet the Debian Free Software Guidelines --------------------------------------------------------------- +List of Licenses that Meet the Debian Free Software Guidelines [res-dfsg-free] +------------------------------------------------------------------------------ The Debian Project is the community that develops the Debian GNU/Linux distribution, sponsored by Software in the Public Interest, Inc. (SPI). The @@ -150,8 +152,8 @@ under the following categories are considered non-free by this resource: For the avoidance of doubt, the GNU Free Documentation License is considered free by this resource when it is applied with no invariant sections. -List of Licenses that Meet the Definition of Free Cultural Works ----------------------------------------------------------------- +List of Licenses that Meet the Definition of Free Cultural Works [res-dfcw-ll] +------------------------------------------------------------------------------ The Definition of Free Cultural Works was initiated by Erik Möller and co-initiated by Benjamin Mako Hill. Along with the definition itself is @@ -161,8 +163,8 @@ For the purposes of this policy, all licenses listed in the referenced document are considered free by this resource. -General Legal Issues -==================== +General Legal Issues [general-legal-issues] +=========================================== Software packages the use or distribution of which is unlawful may not be included in this distribution. diff --git a/policies/inclusion/source.mdwn b/policies/inclusion/source.mdwn index 0cc44d2..d2ce35d 100644 --- a/policies/inclusion/source.mdwn +++ b/policies/inclusion/source.mdwn @@ -1,8 +1,5 @@ -Title: Source Code - - -Definition of Source Code -========================= +Definition of Source Code [defn-source] +======================================= The "source code" of a software package is the form that is preferred for making modifications to it. This form varies with the nature of the software package. @@ -14,8 +11,8 @@ computer system. It need not include software that is made available in source code form elsewhere. -Provision of Source Code -======================== +Provision of Source Code [source-provision] +=========================================== To be included in this distribution, every part of a software package must be available in source code form. The binary packages generated from the |