Index: openacs-4/packages/acs-core-docs/www/backup-recovery.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/backup-recovery.html,v diff -u -r1.40.2.1 -r1.40.2.2 --- openacs-4/packages/acs-core-docs/www/backup-recovery.html 18 Jun 2010 21:29:34 -0000 1.40.2.1 +++ openacs-4/packages/acs-core-docs/www/backup-recovery.html 12 Dec 2010 00:07:02 -0000 1.40.2.2 @@ -1,6 +1,12 @@ +<<<<<<< backup-recovery.html Chapter 8. Backup and Recovery

Chapter 8. Backup and Recovery

Table of Contents

Backup Strategy
Manual backup and recovery
Automated Backup
Using CVS for backup-recovery
($Id$)

By Don Baccus with additions by Joel Aufrecht

We will cover some basic backup and recovery strategies. These are intended to +======= + +Chapter 8. Backup and Recovery

Chapter 8. Backup and Recovery

($Id$)

By Don Baccus with additions + by Joel Aufrecht

We will cover some basic backup and recovery strategies. These are intended to +>>>>>>> 1.41 be robust but simple enough to set up. For a large scale production site you would probably need to create your own backup strategies (in particular full dumps from oracle, while easy to set up, are far from the best solution).