Attachment 1438 Details for Bug 9280 – правка форматирования

[patch] правка форматирования

backup.alenitchev.format.patch (text/plain), 3.77 KB, created by kirill on 2006-03-20 10:48:08 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: kirill

Created: 2006-03-20 10:48:08 MSK

Size: 3.77 KB

patch

obsolete

>Tue Mar 14 20:30:50 MSK 2006  kirill@altlinux.ru
>  * ÐÒÁ×ËÁ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÑ
>diff -rN -u old-backup.alenitchev.050926/doc/backup.xml new-backup.alenitchev.050926/doc/backup.xml
>--- old-backup.alenitchev.050926/doc/backup.xml	2006-03-14 20:43:21 +0300
>+++ new-backup.alenitchev.050926/doc/backup.xml	2006-03-14 20:43:21 +0300
>@@ -82,8 +82,7 @@
> <screen>
> #!/bin/sh
> tar -zcf /backup/home.tar.gz /home
>-tar -zcf /backup/etc.tar.gz /etc
>-</screen></para>
>+tar -zcf /backup/etc.tar.gz /etc</screen></para>
> 
>     <para>÷ ÜÔÏÍ ÓËÒÉÐÔÅ ÎÅÔ ÎÉÞÅÇÏ ÏÓÏÂÅÎÎÏÇÏ, ÎÏ ÏÓÎÏ×ÎÙÅ ÐÒÉÎÃÉÐÙ ÏÎ 
>       ÄÅÍÏÎÓÔÒÉÒÕÅÔ:
>@@ -134,8 +133,8 @@
> <screen>
> #!/bin/sh
> tar -zcvpf /backup/backup-`date '+%d-%B-%Y'`.tar.gz --directory / \
>-   --exclude=proc --exclude=var --exclude=mnt --exclude=usr --exclude=backup .
>-</screen></para>
>+--exclude=proc --exclude=var --exclude=mnt --exclude=usr \
>+--exclude=backup .</screen></para>
> 
>     <para>÷ ÄÁÎÎÏÍ ÐÒÉÍÅÒÅ ÓÏÈÒÁÎÑÀÔÓÑ ÎÅ ÏÔÄÅÌØÎÙÅ ÄÉÒÅËÔÏÒÉÉ, Á ËÏÒÎÅ×ÁÑ 
>       ÄÉÒÅËÔÏÒÉÑ <filename class="directory">/</filename>, ÉÓËÌÀÞÁÑ 
>@@ -186,9 +185,9 @@
>         ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ, ÞÔÏ ÜÔÏ <filename>/dev/hdb1</filename>, &IE; ÐÅÒ×ÙÊ
>         ÒÁÚÄÅÌ ÎÁ ×ÔÏÒÏÍ ÄÉÓËÅ ËÁÎÁÌÁ &IDE;1. óÏÚÄÁÊÔÅ ÔÏÞËÕ ÍÏÎÔÉÒÏ×ÁÎÉÑ:
> <screen>
>-cd /
>-mkdir backup
>-</screen></para>
>+$ cd /
>+$ mkdir backup</screen></para>
>+
>         <para>äÏÐÏÌÎÉÔÅ ×ÁÛÉ ÓËÒÉÐÔÙ ÄÌÑ ÒÅÚÅÒ×ÎÏÇÏ ËÏÐÉÒÏ×ÁÎÉÑ ÓÌÅÄÕÀÝÉÍÉ
>           ÓÔÒÏËÁÍÉ:
> <screen>
>@@ -213,14 +212,14 @@
>   <title>òÅÚÅÒ×ÎÏÅ ËÏÐÉÒÏ×ÁÎÉÅ ÐÏ ÒÁÓÐÉÓÁÎÉÀ</title>
>     <para>äÁÌÅÅ ×ÁÍ ÐÒÅÄÓÔÏÉÔ ÎÁÓÔÒÏÉÔØ ÚÁÐÕÓË ÓËÒÉÐÔÁ ÐÏ ÒÁÓÐÉÓÁÎÉÀ. îÁ ÓÁÍÏÍ
>       ÄÅÌÅ ÎÅÔ ÎÉÞÅÇÏ ÐÒÏÝÅ. óÏ ×ÒÅÍÅÎ ïó &UNIX; ÓÕÝÅÓÔ×ÕÅÔ ÐÒÏÇÒÁÍÍÁ
>-      <application>cron</application>, ÐÒÅÄÎÁÚÎÁÞÅÎÎÁÑ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÄÅÊÓÔ×ÉÊ
>-      ÐÏ ÒÁÓÐÉÓÁÎÉÀ. ïÔËÒÏÊÔÅ ÆÁÊÌ <filename>/etc/crontab</filename> É ÚÁÐÉÛÉÔÅ 
>+	  <command>cron</command>, ÐÒÅÄÎÁÚÎÁÞÅÎÎÁÑ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÄÅÊÓÔ×ÉÊ
>+	  ÐÏ ÒÁÓÐÉÓÁÎÉÀ. ïÔËÒÏÊÔÅ ÆÁÊÌ <filename>/etc/crontab</filename> É ÚÁÐÉÛÉÔÅ 
>       ÎÏ×ÏÅ ÐÒÁ×ÉÌÏ:
> 
> <screen>
>-#ÍÉÎ	ÞÁÓ	ÞÉÓÌÏ	ÍÅÓÑÃ	ÄÅÎØ ÎÅÄÅÌÉ	ËÏÍÁÎÄÁ
>-0	1	*	*	5		/usr/bin/full-backup
>-</screen></para>
>+#ÍÉÎ ÞÁÓ  ÞÉÓÌÏ  ÍÅÓÑÃ  ÄÅÎØ ÎÅÄÅÌÉ  ËÏÍÁÎÄÁ
>+0    1    *      *      5            /usr/bin/full-backup</screen>
>+</para>
> 
>     <para>üÔÏ ÐÒÁ×ÉÌÏ ÂÕÄÅÔ ×ÙÐÏÌÎÑÔØÓÑ ËÁÖÄÕÀ ÐÑÔÎÉÃÕ × 1 ÞÁÓ ÎÏÞÉ. äÌÑ 
>       ÕËÁÚÁÎÉÑ ÕÄÏÂÎÏÇÏ ÄÌÑ ×ÁÓ ×ÒÅÍÅÎÉ ÚÁÐÉÛÉÔÅ ÎÕÖÎÙÅ ÚÎÁÞÅÎÉÑ × 
>@@ -249,15 +248,13 @@
>       <filename>/backup/backup-07-March-2005.tar.gz</filename>:
> 
> <screen>
>-tar -ztvpf /backup/backup-07-March-2005.tar.gz
>-</screen></para>
>+tar -ztvpf /backup/backup-07-March-2005.tar.gz</screen></para>
> 
>     <tip>
>       <para>îÅ ÚÁÂÙ×ÁÊÔÅ Ï ËÏÎ×ÅÊÅÒÁÈ. äÌÑ ÐÏÉÓËÁ ÆÁÊÌÁ × ÁÒÈÉ×Å ×Ù ÍÏÖÅÔÅ 
>         ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÇÒÁÍÍÕ &GNU; <application>grep</application>:
> <screen>
>-tar -ztvpf /backup/backup-07-March-2005.tar.gz | grep smb.conf
>-</screen></para>
>+tar -ztvpf /backup/backup-07-March-2005.tar.gz | grep smb.conf</screen></para>
>     </tip>
> 
>     <para>äÌÑ ÉÚ×ÌÅÞÅÎÉÑ ÆÁÊÌÏ× ÉÚ ÁÒÈÉ×Á ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÏÐÃÉÑ 
>@@ -266,8 +263,8 @@
>     <filename>/backup/backup-12-March-2005.tar.gz</filename>:
> 
> <screen>
>-tar -zxvpf /backup/backup-12-March-2005.tar.gz
>-</screen></para>
>+tar -zxvpf /backup/backup-12-March-2005.tar.gz</screen>
>+	</para>
> 
>     <para>äÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÏÐÒÅÄÅÌÅÎÎÙÈ ÆÁÊÌÏ× ÉÚ ÁÒÈÉ×Á ÕËÁÖÉÔÅ ÉÈ ÉÍÅÎÁ 
>       ÐÏÓÌÅ ÉÍÅÎÉ ÁÒÈÉ×Á. îÁÐÒÉÍÅÒ, ÓÌÅÄÕÀÝÁÑ ËÏÍÁÎÄÁ ×ÏÓÓÔÁÎÏ×ÉÔ ÆÁÊÌÙ 
>@@ -276,9 +273,9 @@
>       <filename>/backup/backup-17-March-2005.tar.gz</filename>:
> 
> <screen>
>-tar -zxvpf /backup/backup-17-March-2005.tar.gz home/alenitchev/adt/backup.xml \
>-   etc/sendmail.cf
>-</screen></para>
>+tar -zxvpf /backup/backup-17-March-2005.tar.gz \
>+home/alenitchev/adt/backup.xml etc/sendmail.cf</screen>
>+</para>
> 
>     <para>ðÅÒÅÄ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅÍ ÆÁÊÌÁ ÉÚ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ ÕÂÅÄÉÔÅÓØ, ÞÔÏ       
>       ×ÏÓÓÔÁÎÁ×ÌÉ×ÁÅÍÙÊ ÆÁÊÌ ÎÅ ÚÁÍÅÎÉÔ ÂÏÌÅÅ ÎÏ×ÙÊ ÜËÚÅÍÐÌÑÒ.
>

Actions: View | Diff

Attachments on bug 9280: 1436 | 1437 | 1438