summaryrefslogtreecommitdiff
path: root/documentation/boxbackup/adminguide.xml
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-05-10 21:47:48 +0000
committerChris Wilson <chris+github@qwirx.com>2007-05-10 21:47:48 +0000
commit8a62484a39528b2921d0f3e39e263e3c26c85e13 (patch)
tree8ee3272d6db77ff932cd89b1f9328dc31f4116ef /documentation/boxbackup/adminguide.xml
parent1086a5fea7adf15f4a9602b691832a0e0a2a705b (diff)
Fix the license in the docs to reflect the actual license. (refs #3,
merges [1652])
Diffstat (limited to 'documentation/boxbackup/adminguide.xml')
-rw-r--r--documentation/boxbackup/adminguide.xml45
1 files changed, 28 insertions, 17 deletions
diff --git a/documentation/boxbackup/adminguide.xml b/documentation/boxbackup/adminguide.xml
index c33e49d0..43bc6103 100644
--- a/documentation/boxbackup/adminguide.xml
+++ b/documentation/boxbackup/adminguide.xml
@@ -9,8 +9,8 @@
<preface>
<title>License</title>
- <para>Copyright © 2003 - 2006, Ben Summers and contributors. All rights
- reserved.</para>
+ <para>Copyright &copy; 2003 - 2007, Ben Summers and contributors.
+ All rights reserved.</para>
<para>Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -30,23 +30,34 @@
</listitem>
<listitem>
- <para>Neither the name of the authors nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission</para>
+ <para>All use of this software and associated advertising materials
+ must display the following acknowledgement: This product includes
+ software developed by Ben Summers.</para>
+ </listitem>
+
+ <listitem>
+ <para>The names of the Authors may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.</para>
</listitem>
</itemizedlist>
- <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
+
+ <para>[Where legally impermissible the Authors do not disclaim liability
+ for direct physical injury or death caused solely by defects in the
+ software unless it is modified by a third party.]</para>
+
+ <para>THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.</para>
</preface>
<chapter>
@@ -1229,4 +1240,4 @@ make</programlisting>
testing, and should not be relied on in a production environment.</para>
</section>
</appendix>
-</book> \ No newline at end of file
+</book>