From: Russ Allbery Date: Fri, 4 Jun 2010 16:43:00 +0000 (-0700) Subject: Reletter Process and update HTML style for *.org files X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9948a5a032d32f346248149d55ef8bfd84d39dab;p=debian%2Fdebian-policy.git Reletter Process and update HTML style for *.org files Reletter the process steps to not skip State C and use more traditional foreground and background colors for Process.html and README.html. (Closes: #584521) --- diff --git a/Process.html b/Process.html index 9440ae7..e88aa79 100644 --- a/Process.html +++ b/Process.html @@ -4,16 +4,10 @@ -
- UP - | - HOME -
- Debian Policy changes process - + @@ -43,8 +37,8 @@ lang="en" xml:lang="en"> font-weight:bold; } body { - color: DarkSlateGrey; - background-color: gainsboro; + color: black; + background-color: white; font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif; } .org-agenda-date { color: #87cefa; } @@ -58,12 +52,6 @@ lang="en" xml:lang="en"> font-weight: bold; } - a { - color: inherit; - background-color: inherit; - font: inherit; - text-decoration: inherit; - } a:hover { text-decoration: underline; } .todo { font-weight:bold; } .done { font-weight:bold; } @@ -120,6 +108,12 @@ org_html_manager.setup ();
+
+ UP + | + HOME +
+

Debian Policy changes process

@@ -195,9 +189,9 @@ of the Policy Team.
-
-

State A: Issue raised

-
+
+

State A: Issue raised

+

@@ -217,9 +211,9 @@ Policy, close the bug.

-
-

State B: Discussion

-
+
+

State B: Discussion

+

@@ -237,9 +231,9 @@ anything), moving to the proposal tag.

-
-

State D: Proposal

-
+
+

State C: Proposal

+

@@ -258,9 +252,9 @@ patch tag.

-
-

State E: Wording proposed

-
+
+

State D: Wording proposed

+

@@ -280,9 +274,9 @@ bug log by seconding the proposal.

-
-

State F: Seconded

-
+
+

State E: Seconded

+

@@ -312,9 +306,9 @@ seconds are reached.

-
-

State G: Accepted

-
+
+

State F: Accepted

+

@@ -332,9 +326,9 @@ a new version of Policy.

-
-

State H: Reject

-
+
+

State G: Reject

+

@@ -413,10 +407,9 @@ and wontfix (used with their normal meanings).

Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava -<srivasta@debian.org>

-

Date: 2009-09-13 16:13:52 CDT

-

HTML generated by org-mode 6.30trans in emacs 23

+

Date: 2010-06-04 09:41:24 PDT

+

HTML generated by org-mode 6.36c in emacs 23

diff --git a/Process.org b/Process.org index 7cb0544..a0f6ab7 100644 --- a/Process.org +++ b/Process.org @@ -98,7 +98,7 @@ What needs to happen next: Reach a conclusion and consensus in the discussion and make a final proposal for what should be changed (if anything), moving to the proposal tag. -** State D: Proposal +** State C: Proposal A final proposal has emerged from the discussion, and there is a rough consensus on how to proceed to resolve the issue. @@ -110,7 +110,7 @@ wording of the change. Often this is done in conjunction with the proposal, in which case one may skip this step and move directly to patch tag. -** State E: Wording proposed +** State D: Wording proposed A patch against the Policy document reflecting the consensus has been created and is waiting for formal seconds. The standard patch tag is @@ -123,7 +123,7 @@ seconded. Any Debian developer who agrees with the change and the conclusion of rough consensus from the discussion should say so in the bug log by seconding the proposal. -** State F: Seconded +** State E: Seconded The proposal is signed off on by N Debian Developers. To start with, we're going with N=3, meaning that if three Debian Developers agree, @@ -145,7 +145,7 @@ This tag is not used very much because normally a Policy maintainer applies the patch and moves the proposal to the next state once enough seconds are reached. -** State G: Accepted +** State F: Accepted Change accepted, will be in next upload. The standard pending tag is used for this state since it matches the regular meaning of @@ -156,7 +156,7 @@ What needs to happen next: The bug is now in the waiting queue for the next Policy release, and there's nothing left to do except for upload a new version of Policy. -** State H: Reject +** State G: Reject Rejected proposals. The standard wontfix is used for this state. Normally, bugs in this state will not remain open; instead, a diff --git a/Process.txt b/Process.txt index f130c1d..37136b7 100644 --- a/Process.txt +++ b/Process.txt @@ -1,8 +1,8 @@ Debian Policy changes process ============================= -Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava -Date: 2009-09-13 01:17:13 CDT +Author: Margarita Manterola, Clint Adams, Russ Allbery, and Manoj Srivastava +Date: 2010-06-04 09:41:23 PDT Change Goals @@ -83,7 +83,7 @@ anything), moving to the proposal tag. [TAG: discussion]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=discussion -State D: Proposal +State C: Proposal ================== A final proposal has emerged from the discussion, and there is a rough @@ -99,7 +99,7 @@ patch tag. [TAG: proposal]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=proposal -State E: Wording proposed +State D: Wording proposed ========================== A patch against the Policy document reflecting the consensus has been @@ -116,7 +116,7 @@ bug log by seconding the proposal. [TAG: patch]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=patch -State F: Seconded +State E: Seconded ================== The proposal is signed off on by N Debian Developers. To start with, @@ -142,7 +142,7 @@ seconds are reached. [TAG: seconded]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=seconded -State G: Accepted +State F: Accepted ================== Change accepted, will be in next upload. The standard pending tag is @@ -157,7 +157,7 @@ a new version of Policy. [TAG: pending]: http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=debian-policy&pend-exc=done&tag=pending -State H: Reject +State G: Reject ================ Rejected proposals. The standard wontfix is used for this diff --git a/README-css.el b/README-css.el index 9b7cf85..7dfb41b 100644 --- a/README-css.el +++ b/README-css.el @@ -27,8 +27,8 @@ font-weight:bold; } body { - color: DarkSlateGrey; - background-color: gainsboro; + color: black; + background-color: white; font-family: Palatino, \"Palatino Linotype\", \"Hoefler Text\", \"Times New Roman\", Times, Georgia, Utopia, serif; } .org-agenda-date { color: #87cefa; } @@ -42,12 +42,6 @@ font-weight: bold; } - a { - color: inherit; - background-color: inherit; - font: inherit; - text-decoration: inherit; - } a:hover { text-decoration: underline; } .todo { font-weight:bold; } .done { font-weight:bold; } diff --git a/README.html b/README.html index 19608a2..438927d 100644 --- a/README.html +++ b/README.html @@ -4,16 +4,10 @@ -
- UP - | - HOME -
- Debian Policy - + @@ -43,8 +37,8 @@ lang="en" xml:lang="en"> font-weight:bold; } body { - color: DarkSlateGrey; - background-color: gainsboro; + color: black; + background-color: white; font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif; } .org-agenda-date { color: #87cefa; } @@ -58,12 +52,6 @@ lang="en" xml:lang="en"> font-weight: bold; } - a { - color: inherit; - background-color: inherit; - font: inherit; - text-decoration: inherit; - } a:hover { text-decoration: underline; } .todo { font-weight:bold; } .done { font-weight:bold; } @@ -120,6 +108,12 @@ org_html_manager.setup ();
+
+ UP + | + HOME +
+

Debian Policy

@@ -158,9 +152,9 @@ to manage the repository but not otherwise used)
-
-

Interacting with the team

-
+
+

Interacting with the team

+