Include the NEWS file in the web page.

Reformat the release headers in the NEWS file to make the html variant
produced by grutatxt nicer.

diff --git a/Makefile b/Makefile
index f59e315752fd83e8949e0392e2c96e198b4d9a67..99b82867cb66c3cba358dce6c64019d2e237de2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,10 +45,12 @@ dss.1: dss dss.1.inc
 clean:
        rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h index.html
 
-index.html: dss.1.html index.html.in INSTALL README
+index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '/@README@/,$$d' index.html.in > $@
        grutatxt -nb < README >> $@
-       sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
+       sed -e '1,/@README@/d' -e '/@NEWS@/,$$d' index.html.in >> $@
+       grutatxt -nb < NEWS >> $@
+       sed -e '1,/@NEWS@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
        grutatxt -nb < INSTALL >> $@
        sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' index.html.in >> $@
        sed -e '1,/Return to Main Contents/d' -e '/Index/,$$d' dss.1.html >> $@

diff --git a/NEWS b/NEWS
index 32ed67502e792836813f607d7df9055102e9ba6d..6b9deec56c582937b0b7aaee468b1eade7258d15 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
-------------------
 0.1.4 (2010-11-08)
-------------------
-
+~~~~~~~~~~~~~~~~~~
 This version of dss contains some new features, many improvements of
 existing features and several bug fixes.
 
@@ -11,36 +9,28 @@ exists. The internal handling of the various hooks has been simplified
 and many error messages have been clarified. On SIGHUP, dss now writes
 its configuration and internal state to the log file.
 
-------------------
 0.1.3 (2009-06-06)
-------------------
-
+~~~~~~~~~~~~~~~~~~
 You can now specify pre-rm/post-rm-hooks that are executed whenever
 a snapshot is deleted. This release adds better compatibility with
 rsync 3.0, and avoids busy loops when automatically restarting the
 rsync process.
 
-------------------
 0.1.2 (2009-03-05)
-------------------
-
+~~~~~~~~~~~~~~~~~~
 This release includes the reason why a snapshot gets removed in the
 log message. It will never remove the snapshot that is currently
 being created. It will really pass the full path to the last complete
 snapshot in the post_create_hook.
 
-------------------
 0.1.1 (2008-11-13)
-------------------
-
+~~~~~~~~~~~~~~~~~~
 This release prevents busy loops on rsync exit code 13. It ignores
 any snapshot directory with creation time > completion time. It
 opens /dev/null for reading and writing when executing rsync. It shows
 human readable snapshot creation duration when listing snapshots. It
 restarts the rsync process if it returned with exit code 13.
 
-------------------
 0.1.0 (2008-10-10)
-------------------
-
+~~~~~~~~~~~~~~~~~~
 Initial public release.

diff --git a/index.html.in b/index.html.in
index b42402f7720f8191ac37b191ce005ab2094aba00..d89af071066ef6765a1c9b8fca9bf443d1c05982 100644 (file)
--- a/index.html.in
+++ b/index.html.in
@@ -23,6 +23,7 @@
        <hr>
 
        [<a href="#readme">README</a>]
+       [<a href="#news">NEWS</a>]
        [<a href="#download">Download</a>]
        [<a href="#install">INSTALL</a>]
        [<a href="#license">License</a>]
@@ -41,6 +42,15 @@
 
        <hr>
 
+       <center>
+               <h2>
+                       <a name="news">NEWS</a>
+               </h2>
+       </center>
+
+       @NEWS@
+
+       <hr>
 
        <center>
                <h2>