From 3081199b566721843491560f1c106d6090c793bf Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@hydrogenium.schottelius.org>
Date: Tue, 25 Apr 2006 15:19:53 +0200
Subject: [PATCH] Major changes

Added note to german documentation

Removed colon (:) in interval name

Updated CHANGES

Updated documentation (incompatibilities)
---
 Makefile          |  2 +-
 README            | 11 +++++++----
 ccollect.sh       |  4 ++--
 doc/CHANGES       |  5 +++++
 doc/ccollect.text | 18 +++++++++++++++++-
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 632e0a0..701f08f 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ install-script:
 	$(INSTALL) -D -m 0755 -s $(CCOLLECT) $(destination)
 
 documentation:
-	@echo "Generating HTML-documentation (en de) ..."
+	@echo "Generating HTML-documentation (de en) ..."
 	@asciidoc -n -o doc/ccollect.html  doc/ccollect.text
 	@asciidoc -n -o doc/ccollect-DE.html  doc/ccollect-DE.text
 
diff --git a/README b/README
index c0857d2..93b5f64 100644
--- a/README
+++ b/README
@@ -8,11 +8,14 @@ ccollect backups data from local or remote hosts to your local harddisk.
 You can retriev the latest version of ccollect at [0].
 
 doc/ccollect.text          Manual in text format
-doc/ccollect.html          Manual in xhtml
+doc/ccollect.html          Manual in xhtml (generated)
 
-ccollect was inspired by rsnapshot [1], which had some problems:
-   - configuration parameters had to be TAB seperated
-   - you could not specify exclude lists differently for every source
+doc/ccollect-DE.text       german Manual in text format (externally maintained)
+doc/ccollect-DE.html       german Manual in xhtml (generated)
+
+ccollect was inspired by rsnapshot [1], which has some problems:
+   - configuration parameters has to be TAB seperated
+   - you can not specify per source exclude lists
    - no per source pre/post execution support
    - no parallel execution
    - I didn't like the configuration at all, so I used the cconfig style [2].
diff --git a/ccollect.sh b/ccollect.sh
index c4f60c3..5eb0ee9 100755
--- a/ccollect.sh
+++ b/ccollect.sh
@@ -304,7 +304,7 @@ while [ "$i" -lt "$no_shares" ]; do
       SUMMARY="--stats"
    fi
    
-   # verbosity for rsync
+   # Verbosity for rsync
    if [ -f "$c_verbose" ]; then
       VERBOSE="-v"
    fi
@@ -341,7 +341,7 @@ while [ "$i" -lt "$no_shares" ]; do
    # clone the old directory with hardlinks
    #
 
-   destination_date=$(date +%Y-%m-%d-%H:%M)
+   destination_date=$(date +%Y-%m-%d-%H%M)
    destination_dir="$c_dest/${INTERVALL}.${destination_date}.$$"
    
    last_dir=$(ls -d "$c_dest/${INTERVALL}."?* 2>/dev/null | sort -n | tail -n 1)
diff --git a/doc/CHANGES b/doc/CHANGES
index e2d0600..8fbf671 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,8 @@
+0.3.3 to 0.4:
+   * `pax` (Posix) is now required, `cp -al` (GNU specific) is removed
+   * "interval" was written with two 'l' (ell), which is wrong in English
+   * Changed the name of backup directories, removed the colon in the interval
+
 0.3.2 to 0.3.3:
    * Fix a small bug, which suppressed information when rsync exits non-zero
 
diff --git a/doc/ccollect.text b/doc/ccollect.text
index e741d6b..96c79aa 100644
--- a/doc/ccollect.text
+++ b/doc/ccollect.text
@@ -33,6 +33,22 @@ machine, he/she will not be able to login to the backup machine.
 All other backups are still secure.
 
 
+Incompatibilities
+~~~~~~~~~~~~~~~~~
+
+
+Versions < 0.4 and 0.4
+^^^^^^^^^^^^^^^^^^^^^^
+
+Since `ccollect` 0.4 there are several incompatibilities with earlier
+versions:
+
+.List of incompatibilities 
+- `pax` (Posix) is now required, `cp -al` (GNU specific) is removed
+- "interval" was written with two 'l' (ell), which is wrong in English
+- Changed the name of backup directories, removed the colon in the interval
+
+
 Requirements
 ------------
 
@@ -49,7 +65,7 @@ Using ccollect
 ~~~~~~~~~~~~~~
 .Running ccollect requires the following tools installed:
    - `bc`
-   - `cp` with support for hard links ('cp -al')
+   - `pax` *NEW* (since ccollect 0.4, replaces previously used `cp -al`)
    - `date`
    - `rsync`
    - `ssh` (if you want to use rsync over ssh, which is recommened for security)