From 7ab5ace250ae1983b3c80e01333a2ece35cadacd Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Tue, 13 Jun 2006 12:44:32 +0200
Subject: [PATCH] .gitignore, Makefile, ccollect.sh, CHANGES

Added more generated dac to .gitignore

Added changing permissions on webserver

Fixed bug when user specifies "ccollect interval source/"
(If a user has a ":" in its path he should be shoot).

Added note to new documentation.
---
 .gitignore  | 3 +++
 Makefile    | 3 ++-
 ccollect.sh | 2 +-
 doc/CHANGES | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e556f2d..2292884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ doc/old
 doc/*.html
 doc/*.docbook
 doc/*.texi
+doc/man/*.html
+doc/man/*.texi
+doc/man/*.man
diff --git a/Makefile b/Makefile
index f674646..73efd35 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,8 @@ push-work:
 publish-doc: documentation
 	@echo "Transferring files to $(host)"
 	@chmod a+r doc/*.html doc/*.text
-	@scp doc/*.text doc/*.html $(host):$(docdir)
+	@scp doc/*.text doc/*.html doc/*.texi doc/man/*.man $(host):$(docdir)
+	@ssh $(host) "cd $(docdir); chmod a+r *"
 
 #
 # Doku
diff --git a/ccollect.sh b/ccollect.sh
index c851842..d18fd06 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -41,7 +41,7 @@ trap "rm -f \"$TMP\"" 1 2 15
 
 add_name()
 {
-   sed "s/^/\[$name\] /"
+   sed "s:^:\[$name\] :"
 }
 
 #
diff --git a/doc/CHANGES b/doc/CHANGES
index bcde1fd..5668a3d 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,7 @@
 0.4 to 0.4.1:
    * updated documentation
-   * created new document formats: Texinfo and manpage
+   * added Texinfo documentation
+   * added a manpage (English)
    * fixed problem with 'make install' (strip was used)
    * fixed possible problem with pre_exec beeing executed to late