From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 30 Oct 2005 16:14:37 +0000 (+0000)
Subject: Fix bacula-doc name to be bacula-docs
X-Git-Tag: Release-1.38.0~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e0dd4b7caaa1a6655159fdc03089b3330d892d8b;p=bacula%2Fdocs

Fix bacula-doc name to be bacula-docs
---

diff --git a/docs/Makefile b/docs/Makefile
index c23a2b42..34a8b1ce 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -99,7 +99,7 @@ $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)
 	$(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@
 
 clean:
-	$(RMF) *~ 1 2 3
+	$(RMF) *~ 1 2 3 bacula-doc*.tar.gz
 	(cd manual; make clean)
 	(cd manual-de; make clean)
 	(cd manual-fr; make clean)
@@ -122,18 +122,18 @@ uninstall:
 #	-cd $(mandir); $(RMF) $(manprefix)bacula.$(manext)
 
 release:
-	rm -rf bacula-doc-*
-	mkdir -p bacula-doc-$(VERSION)
-	cp -ap manual/bacula bacula-doc-$(VERSION)/web-manual
-	mkdir -p bacula-doc-$(VERSION)/html-manual
-	cp -p manual/bacula.html manual/*.png manual/*.css bacula-doc-$(VERSION)/html-manual/
-	cp -p manual/bacula.pdf bacula-doc-$(VERSION)/
-	cp -p developers/developers.pdf bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/kernstodo bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/ReleaseNotes bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/projects bacula-doc-$(VERSION)/
-	tar cvfz bacula-doc-$(VERSION).tar.gz bacula-doc-$(VERSION)
-	rm -rf bacula-doc-$(VERSION)
+	rm -rf bacula-docs-*
+	mkdir -p bacula-docs-$(VERSION)
+	cp -ap manual/bacula bacula-docs-$(VERSION)/web-manual
+	mkdir -p bacula-docs-$(VERSION)/html-manual
+	cp -p manual/bacula.html manual/*.png manual/*.css bacula-docs-$(VERSION)/html-manual/
+	cp -p manual/bacula.pdf bacula-docs-$(VERSION)/
+	cp -p developers/developers.pdf bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/kernstodo bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/ReleaseNotes bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/projects bacula-docs-$(VERSION)/
+	tar cvfz bacula-docs-$(VERSION).tar.gz bacula-docs-$(VERSION)
+	rm -rf bacula-docs-$(VERSION)
 	@echo " "
-	@echo "Release document is in: bacula-doc-$(VERSION).tar.gz"
+	@echo "Release document is in: bacula-docs-$(VERSION).tar.gz"
 	@echo " "
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 8a593c9c..2b471053 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -57,7 +57,7 @@ $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)
 	$(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@
 
 clean:
-	$(RMF) *~ 1 2 3
+	$(RMF) *~ 1 2 3 bacula-doc*.tar.gz
 	(cd manual; make clean)
 	(cd manual-de; make clean)
 	(cd manual-fr; make clean)
@@ -80,18 +80,18 @@ uninstall:
 #	-cd $(mandir); $(RMF) $(manprefix)bacula.$(manext)
 
 release:
-	rm -rf bacula-doc-*
-	mkdir -p bacula-doc-$(VERSION)
-	cp -ap manual/bacula bacula-doc-$(VERSION)/web-manual
-	mkdir -p bacula-doc-$(VERSION)/html-manual
-	cp -p manual/bacula.html manual/*.png manual/*.css bacula-doc-$(VERSION)/html-manual/
-	cp -p manual/bacula.pdf bacula-doc-$(VERSION)/
-	cp -p developers/developers.pdf bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/kernstodo bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/ReleaseNotes bacula-doc-$(VERSION)/
-	cp -p $(BACULASRC)/projects bacula-doc-$(VERSION)/
-	tar cvfz bacula-doc-$(VERSION).tar.gz bacula-doc-$(VERSION)
-	rm -rf bacula-doc-$(VERSION)
+	rm -rf bacula-docs-*
+	mkdir -p bacula-docs-$(VERSION)
+	cp -ap manual/bacula bacula-docs-$(VERSION)/web-manual
+	mkdir -p bacula-docs-$(VERSION)/html-manual
+	cp -p manual/bacula.html manual/*.png manual/*.css bacula-docs-$(VERSION)/html-manual/
+	cp -p manual/bacula.pdf bacula-docs-$(VERSION)/
+	cp -p developers/developers.pdf bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/kernstodo bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/ReleaseNotes bacula-docs-$(VERSION)/
+	cp -p $(BACULASRC)/projects bacula-docs-$(VERSION)/
+	tar cvfz bacula-docs-$(VERSION).tar.gz bacula-docs-$(VERSION)
+	rm -rf bacula-docs-$(VERSION)
 	@echo " "
-	@echo "Release document is in: bacula-doc-$(VERSION).tar.gz"
+	@echo "Release document is in: bacula-docs-$(VERSION).tar.gz"
 	@echo " "
diff --git a/docs/home-page/news.txt b/docs/home-page/news.txt
index b98c476d..2d6a4c41 100644
--- a/docs/home-page/news.txt
+++ b/docs/home-page/news.txt
@@ -1,11 +1,12 @@
-Kern;;;2005/10/28;;;16:30 
-Bacula has been accepting direct donations now for about a month,
-and as of today 28 October 2005, whe have received the following:
+Kern;;;2005/10/29;;;12:30 
+Bacula is now able to accept direct donations, and as of
+29 October 2005, we have received the following:
 
-      Donor:                  Amount:
-        Ludovic Strappazon      $50
+      Amount:      Donor: 
+       $ 50         Ludovic Strappazon         
+       $100         Pontis Corporation, Pavlo Tabashov
 
-Many thanks Ludovic.
+Many thanks to these Bacula supporters.
 
 Kern;;;2005/09/28;;;16:30 
 Results to date of donations to EFF for the Data Encryption project
diff --git a/docs/home-page/pages/donations.php b/docs/home-page/pages/donations.php
index 425cd9a5..82fd4fd8 100644
--- a/docs/home-page/pages/donations.php
+++ b/docs/home-page/pages/donations.php
@@ -68,7 +68,7 @@
     <tr> <td>21-50</td> <td>$150 + $2.00 per machine over 20</td></tr>
     <tr> <td>51-...</td> <td>$250 + $1.00 per machine over 50</td></tr>
     </table>
-    <p>Example: 55 machine = $150 + 5 X $2.00 = $160<br>
+    <p>Example: 55 machines = $250 + 5 X $1.00 = $255<br>
     <p>Upgrades are 10% of the original license fee.
     <p>
     The above table is just a suggestion. You are, of course, free