Import upstream version 0.11~rc3~r2491

5 files changed, 50 insertions, 19 deletions

diff --git a/distribution/COMMON-MANIFEST.txt b/distribution/COMMON-MANIFEST.txt
index f2be35ba..b6f4b6d7 100644
--- a/distribution/COMMON-MANIFEST.txt
+++ b/distribution/COMMON-MANIFEST.txt
@@ -1,4 +1,5 @@
 RUN ./bootstrap
+RUN cd docs; make
 lib/common
 lib/crypto
 lib/server
@@ -11,25 +12,25 @@ test/basicserver/testfiles
 test/crypto
 test/compress
 test/win32
-docs/common notes
-docs/common/lib_common notes/lib_common
-docs/common/lib_crypto notes/lib_crypto
-docs/common/lib_server notes/lib_server
+docs/api-notes
+docs/api-notes/common/lib_common
+docs/api-notes/common/lib_crypto
+docs/api-notes/common/lib_server
 MKDIR infrastructure
 infrastructure/buildenv-testmain-template.cpp
 infrastructure/makebuildenv.pl.in
 infrastructure/makedistribution.pl.in
 infrastructure/makeparcels.pl.in
+infrastructure/parcelpath.pl
+infrastructure/printversion.pl
 infrastructure/BoxPlatform.pm.in
 infrastructure/mingw
 infrastructure/msvc
-configure.ac
 NO-LICENSE config.sub
-config.sub
 NO-LICENSE config.guess
-config.guess
 bootstrap
+configure.ac
+configure
 parcels.txt
 runtest.pl.in
 NO-LICENSE-IN-DIR infrastructure/m4
-configure
diff --git a/distribution/boxbackup/CONTACT.txt b/distribution/boxbackup/CONTACT.txt
index 849c1e76..9f12e435 100644
--- a/distribution/boxbackup/CONTACT.txt
+++ b/distribution/boxbackup/CONTACT.txt
@@ -1,6 +1,6 @@
 
-http://www.fluffy.co.uk/boxbackup/
+http://www.boxbackup.org/
 
-Ben Summers
-ben@fluffy.co.uk
+Ben Summers & contributors
+boxbackup@boxbackup.org
 
diff --git a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
index dcb23cf3..2147e6e3 100644
--- a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
+++ b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
@@ -19,21 +19,51 @@ test/backupstorepatch
 test/bbackupd
 test/bbackupd/testfiles
 test/backupdiff
-docs/raidfile notes
-docs/raidfile/lib_raidfile notes/lib_raidfile
-docs/backup notes
-documentation
-documentation/html
-documentation/html/images
+docs/Makefile
+docs/tools
+docs/api-notes
+docs/api-notes/raidfile/lib_raidfile
+docs/htmlguide
+docs/htmlguide/adminguide
+docs/htmlguide/images
+docs/htmlguide/instguide
+docs/htmlguide/manpages
+docs/man
+MKDIR docs/docbook
+docs/docbook/ExceptionCodes.xml
+docs/docbook/adminguide.xml
+docs/docbook/bb-book.xsl
+docs/docbook/bb-man.xsl.tmpl
+docs/docbook/bb-nochunk-book.xsl
+docs/docbook/bbackupctl.xml
+docs/docbook/bbackupd-config.xml
+docs/docbook/bbackupd.conf.xml
+docs/docbook/bbackupd.xml
+docs/docbook/bbackupquery.xml
+docs/docbook/bbstoreaccounts.xml
+docs/docbook/bbstored-certs.xml
+docs/docbook/bbstored-config.xml
+docs/docbook/bbstored.conf.xml
+docs/docbook/bbstored.xml
+docs/docbook/instguide.xml
+docs/docbook/raidfile-config.xml
+docs/docbook/raidfile.conf.xml
+docs/docbook/html
+docs/docbook/html/images
 TODO.txt
 BUGS.txt
 contrib
 NO-LICENSE-IN-DIR contrib/debian
+NO-LICENSE-IN-DIR contrib/mac_osx
 NO-LICENSE-IN-DIR contrib/redhat
 NO-LICENSE-IN-DIR contrib/rpm
 REPLACE-VERSION-IN contrib/rpm/boxbackup.spec
 NO-LICENSE-IN-DIR contrib/solaris
 NO-LICENSE-IN-DIR contrib/suse
+NO-LICENSE-IN-DIR contrib/bbreporter
+NO-LICENSE-IN-DIR contrib/windows
+NO-LICENSE-IN-DIR contrib/windows/installer
+NO-LICENSE-IN-DIR contrib/windows/installer/tools
 infrastructure/msvc
 NO-LICENSE-IN-DIR infrastructure/msvc/2003
 NO-LICENSE-IN-DIR infrastructure/msvc/2005
diff --git a/distribution/boxbackup/DOCUMENTATION.txt b/distribution/boxbackup/DOCUMENTATION.txt
index 1cda3a2a..f45f61d5 100644
--- a/distribution/boxbackup/DOCUMENTATION.txt
+++ b/distribution/boxbackup/DOCUMENTATION.txt
@@ -1,6 +1,6 @@
 
 For compilation and installation instructions, see the web site at
 
-	http://www.fluffy.co.uk/boxbackup/
+	http://www.boxbackup.org/
 
 
diff --git a/distribution/boxbackup/VERSION.txt b/distribution/boxbackup/VERSION.txt
index f32a59a7..990d8ebe 100644
--- a/distribution/boxbackup/VERSION.txt
+++ b/distribution/boxbackup/VERSION.txt
@@ -1,2 +1,2 @@
-0.11rc2
+0.11_USE_SVN_VERSION
 boxbackup