/[smeserver]/rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-BackupPanelText.patch
ViewVC logotype

Annotation of /rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-BackupPanelText.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (hide annotations) (download)
Wed Dec 18 15:51:05 2013 UTC (10 years, 10 months ago) by wellsi
Branch: MAIN
CVS Tags: e-smith-backup-2_4_0-25_el6_sme, e-smith-backup-2_4_0-46_el6_sme, e-smith-backup-2_4_0-23_el6_sme, e-smith-backup-2_4_0-28_el6_sme, e-smith-backup-2_4_0-35_el6_sme, e-smith-backup-2_4_0-21_el6_sme, e-smith-backup-2_4_0-44_el6_sme, e-smith-backup-2_4_0-37_el6_sme, e-smith-backup-2_4_0-24_el6_sme, e-smith-backup-2_4_0-45_el6_sme, e-smith-backup-2_4_0-31_el6_sme, e-smith-backup-2_4_0-30_el6_sme, e-smith-backup-2_4_0-39_el6_sme, e-smith-backup-2_4_0-40_el6_sme, e-smith-backup-2_4_0-43_el6_sme, e-smith-backup-2_4_0-32_el6_sme, e-smith-backup-2_4_0-42_el6_sme, e-smith-backup-2_4_0-34_el6_sme, e-smith-backup-2_4_0-22_el6_sme, e-smith-backup-2_4_0-36_el6_sme, e-smith-backup-2_4_0-20_el6_sme, e-smith-backup-2_4_0-33_el6_sme, e-smith-backup-2_4_0-26_el6_sme, e-smith-backup-2_4_0-38_el6_sme, e-smith-backup-2_4_0-29_el6_sme, e-smith-backup-2_4_0-27_el6_sme, e-smith-backup-2_4_0-41_el6_sme, HEAD
Changes since 1.1: +17 -11 lines
* Wed Dec 18 2013 Ian Wells <esmith@wellsi.com> 2.4.0-20.sme
- Further refine the text in the Backup panel [SME: 7817]
- Workstation Backup, remove tabs and whitespace changes.

1 wellsi 1.1 diff -ruN e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup
2 wellsi 1.2 --- e-smith-backup-2.4.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2013-12-12 21:37:57.000000000 -0800
3     +++ e-smith-backup-2.4.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/backup 2013-12-17 22:38:59.000000000 -0800
4     @@ -35,36 +35,36 @@
5 wellsi 1.1 <base>BACKUP_DESC_DAR</base>
6     <trans>
7     <![CDATA[
8     - <P>The server provides three ways to back up and restore your
9     - server: using your local desktop, a tape drive or a workstation drive.</P>
10     + <P>Three ways are provided to back up and restore your
11     + server: using a tape drive, using a network share or a local
12     + removable disk, or using your local desktop.</P>
13    
14     - <P>The first method creates a copy of your server configuration and user
15     - data files, and downloads it to your local desktop via your web browser.
16     - Currently your configuration and data files total approximately
17     - <b>$tarsize</b>. The backup file will be somewhat less than this,
18     - depending on how compressible the data are. This file can be used to restore
19     - the server from the console if you copy it to removable storage media
20     - such as a local removable disk.</P>
21     -
22     - <P>The tape backup method uses a software package called <I>$module</I>
23     + <P>Tape Backup. This method uses a software package called <I>$module</I>
24     to back up your entire hard disk to tape every night. This requires a
25     supported tape drive and a tape that is not write-protected. The backup
26     is performed automatically at the selected time every night (with a
27     reminder automatically e-mailed to the administrator during the day).
28     Currently your hard disk contains <b>$dumpsize</b> of data.</P>
29    
30     - <P>The workstation backup method uses a software package called <I>dar</I>
31     - to back up your server configuration and data files to a workstation
32     - on your LAN (or a local removable disk). This requires that you provide a
33     - writable share (cifs or nfs) on the backup workstation or have a local
34     - removable disk such as a USB disk. You can manage how many rotating
35 wellsi 1.2 - sets of backup are kept on the backup share, and also make each
36     - set doing incremental backup upon several days. The backup is performed
37     - automatically at the selected time every day. Currently
38 wellsi 1.1 + <P>Workstation backup. This method uses a software package called <I>dar</I>
39     + to back up your server configuration and data files to a network share
40 wellsi 1.2 + or a local removable disk such as a USB disk.
41     + You can manage how many rotating sets of backups are kept,
42     + and how many incremental backups to have in each set.
43     + The backup is performed automatically at the selected time every day. Currently
44 wellsi 1.1 configuration and data files total approximately <b>$tarsize</b> uncompressed.
45     - Twice the compressed data size must be available on the backup share.</P>
46     + Twice the compressed data size must be available on the backup share.</P>
47     +
48     + <P>Backup to Desktop. This method creates a copy of your server
49     + configuration and user data files, and downloads it to your
50     + local desktop via your web browser.
51     + Currently your configuration and data files total approximately
52     + <b>$tarsize</b>. The backup file will be somewhat less than this,
53 wellsi 1.2 + depending on how much the data can be compressed.
54     + This file can be used to restore the server from the console if you
55     + copy it to a local removable disk such as a USB disk.</P>
56 wellsi 1.1
57 wellsi 1.2 - <P>All restore methods allow you to restore your configuration and user
58     + <P>All backup methods allow you to restore your configuration and user
59 wellsi 1.1 data files. Workstation backup provides individual file restore. <b>Ideally,
60 wellsi 1.2 full restore should be performed on a freshly installed server</b>.</P>
61     ]]>

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed