From 8107444b3d7796e260f998bdf408fe502d928f34 Mon Sep 17 00:00:00 2001
From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Mon, 25 Jan 2010 21:43:39 +0100
Subject: [PATCH] Clean up references in upgrading-checklist.

The old upgrading-checklist assumed references were after the message instead
of before. Adjust to reflect that.
Fix /etc/init.d/*SK]* to /etc/init.d/[SK]*.
---
 upgrading-checklist.html | 17 ++++++++++-------
 upgrading-checklist.org  | 10 +++++-----
 upgrading-checklist.txt  | 12 ++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 4ced011..d20179f 100644
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -7,7 +7,7 @@ lang="en" xml:lang="en">
 <title>Policy checklist for upgrading your packages</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2010-01-25 20:54:51 CET"/>
+<meta name="generated" content="2010-01-25 21:41:30 CET"/>
 <meta name="author" content="Bill Allombert, Josip Rodin, Julian Gilbey, Russ Allbery, and Manoj Srivastava"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -1114,9 +1114,12 @@ Released Jan 2001.
 </p>
 <ul>
 <li>
-Daemon startup scripts in <i>etc/init.d</i> should not contain
+<b>9.3.2</b>: Daemon startup scripts in <i>etc/init.d</i> should not contain
 modifiable parameters; these should be moved to a file in
-<i>etc/default</i>; see <b>9.3.2] for details + *12.3</b>: Files in /usr/share/doc must not be referenced by any
+<i>etc/default</i>
+</li>
+<li>
+<b>12.3</b>: Files in /usr/share/doc must not be referenced by any
 program.  If such files are needed, they must be placed in
 <i>usr/share/&lt;package&gt;</i>, and symbolic links created as required
 in <i>usr/share/doc/&lt;package&gt;</i> 
@@ -1199,7 +1202,7 @@ calculation guidelines)
 </li>
 <li>
 <b>11.8.7</b>: Policy for packages using the X Window System and FHS issues
-has been clarified; see 
+has been clarified
 </li>
 <li>
 <b>11.7.3</b>: No package may contain or make hard links to conffiles 
@@ -1258,7 +1261,7 @@ update-rc.d instead)
 </li>
 <li>
 <b>9.3.3</b>: update-rc.d is now the <b>only</b> allowable way of accessing the
-/etc/rc?.d/*SK]??* links.  Any scripts which manipulate them
+/etc/rc?.d/[SK]??* links.  Any scripts which manipulate them
 directly must be changed to use update-rc.d instead.  (This is
 because the file-rc package handles this information in an
 incompatible way.) 
@@ -1350,7 +1353,7 @@ include the .la files in the -dev packages
 <b>10.8</b>: Use logrotate to rotate log files 
 </li>
 <li>
-<b>now 11.8</b>: section 5.8 has been rewritten (Programs for the X Window
+<b>11.8</b>: section 5.8 (now 11.8) has been rewritten (Programs for the X Window
 System) 
 </li>
 <li>
@@ -1799,7 +1802,7 @@ Upstream changelog must be installed too
 <p class="author"> Author: Bill Allombert, Josip Rodin, Julian Gilbey, Russ Allbery, and Manoj Srivastava
 <a href="mailto:srivasta@debian.org">&lt;srivasta@debian.org&gt;</a>
 </p>
-<p class="date"> Date: 2010-01-25 20:54:51 CET</p>
+<p class="date"> Date: 2010-01-25 21:41:30 CET</p>
 <p class="creator">HTML generated by org-mode 6.33f in emacs 23</p>
 </div>
 </div>
diff --git a/upgrading-checklist.org b/upgrading-checklist.org
index c9dbf90..12cf7d7 100644
--- a/upgrading-checklist.org
+++ b/upgrading-checklist.org
@@ -613,9 +613,9 @@ Released Jan 2001.
 
 Released Jan 2001.
 
-+ Daemon startup scripts in /etc/init.d/ should not contain
++ *9.3.2*: Daemon startup scripts in /etc/init.d/ should not contain
   modifiable parameters; these should be moved to a file in
-  /etc/default/; see *9.3.2] for details
+  /etc/default/
 + *12.3*: Files in /usr/share/doc must not be referenced by any
   program.  If such files are needed, they must be placed in
   /usr/share/<package>/, and symbolic links created as required
@@ -661,7 +661,7 @@ Released Aug 00.
   - *12.8.5*: X fonts (this section has been written from scratch) 
   - *11.8.6*: X application defaults 
 + *11.8.7*: Policy for packages using the X Window System and FHS issues
-  has been clarified; see 
+  has been clarified
 + *11.7.3*: No package may contain or make hard links to conffiles 
 + *8*: Noted that newer dpkg versions do not require extreme care in
   always creating the shared lib before the symlink, so the unpack
@@ -694,7 +694,7 @@ Released Oct 1999.
   (Packages should not be touching this directory, but should use
   update-rc.d instead) 
 + *9.3.3*: update-rc.d is now the *only* allowable way of accessing the
-  /etc/rc?.d/*SK]??* links.  Any scripts which manipulate them
+  /etc/rc?.d/[SK]??* links.  Any scripts which manipulate them
   directly must be changed to use update-rc.d instead.  (This is
   because the file-rc package handles this information in an
   incompatible way.) 
@@ -746,7 +746,7 @@ Released Jun 1999.
 + *10.2*: Packages that use libtool to create shared libraries must
   include the .la files in the -dev packages 
 + *10.8*: Use logrotate to rotate log files 
-+ *now 11.8*: section 5.8 has been rewritten (Programs for the X Window
++ *11.8*: section 5.8 (now 11.8) has been rewritten (Programs for the X Window
   System) 
 + *9.6; menu-policy*: There is now an associated menu policy, in a separate document,
   that carries the full weight of Debian policy 
diff --git a/upgrading-checklist.txt b/upgrading-checklist.txt
index 8949b7f..618c706 100644
--- a/upgrading-checklist.txt
+++ b/upgrading-checklist.txt
@@ -2,7 +2,7 @@
              ============================================
 
 Author: Bill Allombert, Josip Rodin, Julian Gilbey, Russ Allbery, and Manoj Srivastava <srivasta@debian.org>
-Date: 2010-01-25 20:54:53 CET
+Date: 2010-01-25 21:41:31 CET
 
 
 About the checklist 
@@ -514,9 +514,9 @@ Released Jan 2001.
 
 Released Jan 2001.
 
-+ Daemon startup scripts in /etc/init.d/ should not contain
++ *9.3.2*: Daemon startup scripts in /etc/init.d/ should not contain
   modifiable parameters; these should be moved to a file in
-  /etc/default/; see *9.3.2] for details
+  /etc/default/
 + *12.3*: Files in /usr/share/doc must not be referenced by any
   program.  If such files are needed, they must be placed in
   /usr/share/<package>/, and symbolic links created as required
@@ -556,7 +556,7 @@ Released Aug 00.
   - *12.8.5*: X fonts (this section has been written from scratch) 
   - *11.8.6*: X application defaults 
 + *11.8.7*: Policy for packages using the X Window System and FHS issues
-  has been clarified; see 
+  has been clarified
 + *11.7.3*: No package may contain or make hard links to conffiles 
 + *8*: Noted that newer dpkg versions do not require extreme care in
   always creating the shared lib before the symlink, so the unpack
@@ -583,7 +583,7 @@ Released Oct 1999.
   (Packages should not be touching this directory, but should use
   update-rc.d instead) 
 + *9.3.3*: update-rc.d is now the *only* allowable way of accessing the
-  /etc/rc?.d/*SK]??* links.  Any scripts which manipulate them
+  /etc/rc?.d/[SK]??* links.  Any scripts which manipulate them
   directly must be changed to use update-rc.d instead.  (This is
   because the file-rc package handles this information in an
   incompatible way.) 
@@ -629,7 +629,7 @@ Released Jun 1999.
 + *10.2*: Packages that use libtool to create shared libraries must
   include the .la files in the -dev packages 
 + *10.8*: Use logrotate to rotate log files 
-+ *now 11.8*: section 5.8 has been rewritten (Programs for the X Window
++ *11.8*: section 5.8 (now 11.8) has been rewritten (Programs for the X Window
   System) 
 + *9.6; menu-policy*: There is now an associated menu policy, in a separate document,
   that carries the full weight of Debian policy 
-- 
2.39.2