Attachment 1435 Details for Bug 9279 – форматирование и примеры

[patch] форматирование и примеры

user_mail_linux.alenitchev.markup.patch (text/plain), 23.27 KB, created by kirill on 2006-03-20 10:37:53 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: kirill

Created: 2006-03-20 10:37:53 MSK

Size: 23.27 KB

patch

obsolete

>Mon Mar 20 00:42:53 MSK 2006  kirill@altlinux.ru
>  * ÆÏÒÍÁÔÉÒÏ×ÁÎÉÅ É ÐÒÉÍÅÒÙ
>diff -rN -u old-user_mail_linux.alenitchev.050928/doc/linuxmail.xml new-user_mail_linux.alenitchev.050928/doc/linuxmail.xml
>--- old-user_mail_linux.alenitchev.050928/doc/linuxmail.xml	2006-03-20 10:42:01 +0300
>+++ new-user_mail_linux.alenitchev.050928/doc/linuxmail.xml	2006-03-20 10:42:01 +0300
>@@ -110,9 +110,7 @@
>       (ÓÌÕÖÅÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ, ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ, ÐÏÌÕÞÁÔÅÌÑ &ITD;) É
>       <emphasis>ÔÅÌÁ</emphasis> (ÔÅËÓÔÁ, ÎÁÐÉÓÁÎÎÏÇÏ ÏÔÐÒÁ×ÉÔÅÌÅÍ).
>       úÁÇÏÌÏ×ÏË ÏÔÄÅÌÑÅÔÓÑ ÏÔ ÔÅÌÁ ÐÕÓÔÏÊ ÓÔÒÏËÏÊ.
>-    </para>
>-
>-    <para>ðÏÐÒÏÂÕÀ ÏÂßÑÓÎÉÔØ, ÞÔÏ ÍÏÇÕÔ ×ËÌÀÞÁÔØ × ÓÅÂÑ ÚÁÇÏÌÏ×ÏË É
>+      ðÏÐÒÏÂÕÀ ÏÂßÑÓÎÉÔØ, ÞÔÏ ÍÏÇÕÔ ×ËÌÀÞÁÔØ × ÓÅÂÑ ÚÁÇÏÌÏ×ÏË É
>       ÔÅÌÏ ÐÉÓØÍÁ.
>     </para>
> 
>@@ -237,10 +235,9 @@
> 
>   <section id="&BASEID;.sect_02_01">
>     <title>fetchmail</title>
>-    <para>óÁÊÔ ÐÒÏÅËÔÁ:
>-      <ulink url="http://www.catb.org/~esr/fetchmail">
>-        www.catb.org/~esr/fetchmail
>-      </ulink></para>
>+    <para>óÁÊÔ ÐÒÏÅËÔÁ: <ulink
>+	  url="http://www.catb.org/~esr/fetchmail">
>+	  http://www.catb.org/~esr/fetchmail</ulink></para>
> 
>       <para>þÔÏÂÙ ÐÏÌÕÞÁÔØ ÓÏÏÂÝÅÎÉÑ Ó ÐÏÞÔÏ×ÏÇÏ ÓÅÒ×ÅÒÁ, ÎÕÖÎÏ ÓÏÏÂÝÉÔØ
> 	ÐÒÏÇÒÁÍÍÅ ÐÏÌÕÞÅÎÉÑ ÐÏÞÔÙ Ó×ÅÄÅÎÉÑ Ï ×ÁÛÅÍ ÐÏÞÔÏ×ÏÍ ÑÝÉËÅ:
>@@ -252,18 +249,14 @@
> 	<filename>~/.fetchmailrc</filename>: 
>       </para>
> 
>-<screen>
>-&prompt; <userinput>touch ~/.fetchmailrc</userinput>
>-</screen></para>
>+<screen>&prompt; touch ~/.fetchmailrc</screen>
> 
>       <para>éÚÍÅÎÉÔÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ, Ô.&nbsp;Ë. × ÜÔÏÍ ÆÁÊÌÅ ÂÕÄÕÔ
> 	ÈÒÁÎÉÔØÓÑ ×ÁÛÉ ÐÁÒÏÌÉ ÏÔ ÐÏÞÔÙ, É ÏÎ ÎÅ ÄÏÌÖÅÎ ÂÙÔØ ÄÏÓÔÕÐÅÎ
> 	ÄÌÑ ÞÔÅÎÉÑ ÎÉËÏÍÕ, ËÒÏÍÅ ×ÁÓ É ÚÁÐÕÝÅÎÎÏÊ ×ÁÍÉ ÐÒÏÇÒÁÍÍÅ fetchmail:
>       </para>
> 
>-<screen>
>-&prompt; <userinput>chmod 0600 ~/.fetchmailrc</userinput>
>-</screen></para>
>+<screen>&prompt; chmod 0600 ~/.fetchmailrc</screen>
> 
>     <para>îÉÖÅ ×Ù ÎÁÊÄ£ÔÅ ÓÏÄÅÒÖÉÍÏÅ ÔÉÐÉÞÎÏÇÏ ÆÁÊÌÁ ËÏÎÆÉÇÕÒÁÃÉÉ ÄÌÑ 
>       <application>fetchmail</application>.</para>
>@@ -274,12 +267,12 @@
> # .fetchmailrc - ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÄÌÑ fetchmail
> # ÚÁÐÉÓÙ×ÁÔØ ÓÏÂÙÔÉÑ × ÓÉÓÔÅÍÎÙÊ ÖÕÒÎÁÌ
> set syslog
>-# ÏÂÝÉÅ ÄÌÑ ×ÓÅÈ ÕÞÅÔÎÙÈ ÚÁÐÉÓÅÊ ÎÁÓÔÒÏÊËÉ
>-defaults	protocol pop3,	# ÐÒÏÔÏËÏÌ
>-               	timeout 60,	# ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ (× ÓÅËÕÎÄÁÈ)
>-               	nokeep,		# ÕÄÁÌÑÔØ ÐÏÞÔÕ ÎÁ ÓÅÒ×ÅÒÅ ÐÏÓÌÅ ÐÏÌÕÞÅÎÉÑ
>-               	fetchall	# ÐÏÌÕÞÁÔØ ×ÓÀ ÐÏÞÔÕ
>-# ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÕÞÅÔÎÙÈ ÚÁÐÉÓÅÊ ÎÁÓÔÒÏÊËÉ (ÓÅÒ×ÅÒ, login É ÐÁÒÏÌØ)
>+# ÏÂÝÉÅ ÄÌÑ ×ÓÅÈ ÕÞ£ÔÎÙÈ ÚÁÐÉÓÅÊ ÎÁÓÔÒÏÊËÉ
>+defaults    protocol pop3,  # ÐÒÏÔÏËÏÌ
>+            timeout 60,     # ×ÒÅÍÑ ÏÖÉÄÁÎÉÑ (× ÓÅËÕÎÄÁÈ)
>+            nokeep,         # ÐÏÌÕÞÅÎÎÙÅ ÐÉÓØÍÁ ÕÄÁÌÑÔØ Ó ÓÅÒ×ÅÒÁ 
>+            fetchall        # ÐÏÌÕÞÁÔØ ×ÓÀ ÐÏÞÔÕ
>+# ÓÐÅÃÉÆÉÞÎÙÅ ÄÌÑ ÕÞ£ÔÎÙÈ ÚÁÐÉÓÅÊ ÎÁÓÔÒÏÊËÉ (ÓÅÒ×ÅÒ, login É ÐÁÒÏÌØ)
> #
> # õÞ£ÔÎÁÑ ÚÁÐÉÓØ 1
> poll "pop.mailhost.ru",
>@@ -328,10 +321,10 @@
> 
> <programlisting>
> ...
>-fetchall,	# ÐÏÌÕÞÁÔØ ×ÓÀ ÐÏÞÔÕ
>+fetchall,      # ÐÏÌÕÞÁÔØ ×ÓÀ ÐÏÞÔÕ
> mda procmail -f %F
> ...
>-</programlisting></para>
>+</programlisting>
> 
>       <para>÷ ÄÁÎÎÏÍ ÓÌÕÞÁÅ × ËÁÞÅÓÔ×Å MDA ×ÙÓÔÕÐÁÅÔ ÐÒÏÇÒÁÍÍÁ ÄÌÑ
> 	ÓÏÒÔÉÒÏ×ËÉ ÓÏÏÂÝÅÎÉÊ <application>procmail</application>, Á
>@@ -385,6 +378,7 @@
> 	ËÏÍÁÎÄÕ <command>getmail</command>. ðÏÄÒÏÂÎÏÓÔÉ, ËÁË ÏÂÙÞÎÏ,
> 	ÍÏÖÎÏ ÎÁÊÔÉ × ÄÏËÕÍÅÎÔÁÃÉÉ.</para>
>   </section>
>+
> </section>
> 
> <section id="&BASEID;.chap_03">
>@@ -410,9 +404,10 @@
>     ÐÏÞÔÏ×ÏÍ ÆÁÊÌÅ. úÁÔÅÍ ÜÔÏÔ ÓÐÉÓÏË ÎÅÏÂÈÏÄÉÍÏ ÏÔÓÏÒÔÉÒÏ×ÁÔØ × ÁÌÆÁ×ÉÔÎÏÍ 
>     ÐÏÒÑÄËÅ, ÕÄÁÌÉÔØ ÄÕÂÌÉËÁÔÙ É ÚÁÐÉÓÁÔØ × ÆÁÊÌ. ÷ ÓÌÕÞÁÅ Ó mbox ÜÔÏ ÏÞÅÎØ 
>     ÐÒÏÓÔÏ. äÏÓÔÁÔÏÞÎÏ ×ÓÅÇÏ ÏÄÎÏÊ ÓÔÒÏÞËÉ:
>+  </para>
> 
> <screen>
>-&prompt; <userinput>cat ~/Mail/work | grep '^From: ' | sort | uniq > list</userinput>
>+&prompt; cat ~/Mail/work | grep '^From: ' | sort | uniq > list
> </screen>
> 
>     <para>ïÄÎÁËÏ ÈÒÁÎÉÔØ ×ÓÅ ÐÉÓØÍÁ × ÏÄÎÏÍ ÆÁÊÌÅ ÎÅÕÄÏÂÎÏ. îÁÍÎÏÇÏ
>@@ -430,9 +425,9 @@
>     (<filename>~/.procmailrc</filename>):</para>
> 
> <screen>
>-&prompt; <userinput>touch ~/.procmailrc</userinput>
>-&prompt; <userinput>touch ~/Mail/procmail.log</userinput>
>-</screen></para>
>+&prompt; touch ~/.procmailrc
>+&prompt; touch ~/Mail/procmail.log
>+</screen>
> 
>   <example><title>ðÒÉÍÅÒ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ .procmailrc</title>
> 
>@@ -441,40 +436,37 @@
> # ----------
> # ðÅÒÅÍÅÎÎÙÅ
> # ----------
>-
>-MAILDIR=~/Mail		        # ËÁÔÁÌÏÇ Ó ÐÏÞÔÏÊ
>-LOGFILE=~/Mail/procmail.log	# ÌÏÇ ÄÌÑ ÚÁÐÉÓÉ ×ÓÅÈ ÏÐÅÒÁÃÉÊ
>-DEFAULT=~/Mail/mbox		# ÆÁÊÌ ÄÌÑ ÎÅ ÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ
>-
>+MAILDIR=~/Mail		     # ËÁÔÁÌÏÇ Ó ÐÏÞÔÏÊ
>+LOGFILE=~/Mail/procmail.log  # ÖÕÒÎÁÌ ÄÌÑ ÚÁÐÉÓÉ ×ÓÅÈ ÏÐÅÒÁÃÉÊ
>+DEFAULT=~/Mail/mbox          # ÆÁÊÌ ÄÌÑ ÎÅÏÔÓÏÒÔÉÒÏ×ÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ
> # ------------------------
> # ðÒÁ×ÉÌÁ ÓÏÒÔÉÒÏ×ËÉ ÐÏÞÔÙ
> # ------------------------
>-
> # ðÒÉÍÅÒ: ÓÏÒÔÉÒÏ×ËÁ ÐÏÞÔÙ, ÐÒÉÈÏÄÑÝÅÊ ÎÁ e-mail user_name@host.ru
> :0
>-* ^To.*user_name@host.ru		# ÕÓÌÏ×ÉÅ (To: user_name@host.ru)
>-host_mail				# ÆÁÊÌ host_mail × ËÁÔÁÌÏÇÅ MAILDIR
>+* ^To.*user_name@host.ru       # ÕÓÌÏ×ÉÅ (To: user_name@host.ru)
>+host_mail                      # ÆÁÊÌ host_mail × ËÁÔÁÌÏÇÅ MAILDIR
> 
> # ðÒÉÍÅÒ: mailing-list Moscow LUG
> :0
>-* ^To.*mlug@UnixCenter.RU		# ÕÓÌÏ×ÉÅ (To: mlug@UnixCenter.RU)
>-mlug					# ÆÁÊÌ mlug × ËÁÔÁÌÏÇÅ MAILDIR
>+* ^To.*mlug@UnixCenter.RU      # ÕÓÌÏ×ÉÅ (To: mlug@UnixCenter.RU)
>+mlug                           # ÆÁÊÌ mlug × ËÁÔÁÌÏÇÅ MAILDIR
> 
> # ðÒÉÍÅÒ: ÓÏÒÔÉÒÏ×ËÁ ÏÔ ÁÄÒÅÓÁÔÏ× ÉÚ ÄÏÍÅÎÁ friends.org
> :0
>-* ^From.*@friends.org			# ÕÓÌÏ×ÉÅ (From: *@friends.org)
>-friends				        # ÆÁÊÌ friends × ËÁÔÁÌÏÇÅ MAILDIR
>+* ^From.*@friends.org          # ÕÓÌÏ×ÉÅ (From: *@friends.org)
>+friends                        # ÆÁÊÌ friends × ËÁÔÁÌÏÇÅ MAILDIR
> 
> # ðÒÉÍÅÒ: ÕÄÁÌÅÎÉÅ ÐÉÓÅÍ ÏÔ ÁÄÒÅÓÁÔÁ spammer@mail.ru
> :0
>-* ^From.*spammer@mail.ru		# ÕÓÌÏ×ÉÅ (From: spammer@mail.ru)
>-/dev/null				# ËÁÔÁÌÏÇ /dev/null
>+* ^From.*spammer@mail.ru       # ÕÓÌÏ×ÉÅ (From: spammer@mail.ru)
>+/dev/null                      # ×ÙÂÒÏÓÉÔØ -- /dev/null
> 
> # ðÒÉÍÅÒ: Á×ÔÏÍÁÔÉÞÅÓËÁÑ ÏÔÓÙÌËÁ PGP-ËÌÀÞÁ
> 0:
>-* ^Subject.*PGP				# ÕÓÌÏ×ÉÅ (Subject: PGP)
>-| (formail -r ; cat ~/key.asc)	        # ×Ù×ÅÓÔÉ PGP-ËÌÀÞ
>-| sendmail -t				# ÏÔÐÒÁ×ÉÔØ ÅÇÏ
>+* ^Subject.*PGP                # ÕÓÌÏ×ÉÅ (Subject: PGP)
>+| (formail -r ; cat ~/key.asc) # ×Ù×ÅÓÔÉ PGP-ËÌÀÞ
>+| sendmail -t                  # ÏÔÐÒÁ×ÉÔØ ÅÇÏ
> </programlisting></example>
> 
>   <para>÷ ÜÔÏÍ ÐÒÉÍÅÒÅ ÐÒÉ×ÅÄÅÎÙ ÓÁÍÙÅ ÐÒÏÓÔÙÅ, ÎÏ É ÓÁÍÙÅ ÎÕÖÎÙÅ ×ÉÄÙ
>@@ -493,9 +485,7 @@
>     <para>åÓÌÉ × ×ÁÛÅÍ ÐÏÞÔÏ×ÏÍ ÆÁÊÌÅ <emphasis>ÕÖÅ</emphasis> ÎÁÈÏÄÉÔÓÑ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÉÓÅÍ, 
> ÎÕÖÄÁÀÝÉÈÓÑ × ÓÏÒÔÉÒÏ×ËÅ, ÔÏ ×Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:
> 
>-<screen>
>-&prompt; <userinput>cat ~/Mail/mbox | formail -s procmail</userinput>
>-</screen></para>
>+<screen>&prompt; cat ~/Mail/mbox | formail -s procmail</screen></para>
> 
> 
> 
>     <para>ôÅÐÅÒØ ×ÁÍ ÎÕÖÎÏ ÎÁÓÔÒÏÉÔØ ÐÅÒÅÚÁÐÉÓØ ÁÄÒÅÓÁ. äÏÂÁ×ØÔÅ × ÆÁÊÌ
>-      <filename>/etc/exim/exim.conf</filename>, ÓÅËÃÉÀ 
>+      <filename>/etc/exim/exim.conf</filename> ÓÅËÃÉÀ 
>       <quote>REWRITE CONFIGURATION</quote>:
> 
> <programlisting>
>@@ -1116,9 +1099,9 @@
>       <filename>/etc/email-addresses</filename> ÚÁÐÉÓÉ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ:
> 
> <programlisting>
>-root: alenitchev@nm.ru
>-dmitri: alenitchev@nm.ru
>-alenitchev: alenitchev@users.sourceforge.net
>+root:  me@somewhere.tut
>+me:    me@somewhere.tam
>+metoo: me@anywhere.else
> </programlisting></para>
> 
>   </section>
>@@ -1142,12 +1125,12 @@
>       <title>Esmtp</title>
>       <para>óÁÊÔ ÐÒÏÅËÔÁ:
>         <ulink 
>-          url="http://esmtp.sourceforge.net">esmtp.sourceforge.net</ulink>
>+          url="http://esmtp.sourceforge.net">http://esmtp.sourceforge.net</ulink>
>       </para>
>       <para>óÏÚÄÁÊÔÅ ÆÁÊÌ <filename>~/.esmtprc</filename>:
>   
> <screen>
>-&prompt; <userinput>touch ~/.esmtprc</userinput>
>+&prompt; touch ~/.esmtprc
> </screen></para>
> 
>       <example><title>ðÒÉÍÅÒ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ .esmtprc</title>
>@@ -1164,9 +1147,7 @@
> 	  <filename>~/.muttrc</filename> ÎÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ ÓÌÅÄÕÀÝÕÀ 
>         ÓÔÒÏÞËÕ:
> 
>-<screen>
>-set sendmail="esmtp -v"
>-</screen></para>
>+<screen>set sendmail="esmtp -v"</screen></para>
> 
>     </section>
> 
>@@ -1174,12 +1155,12 @@
>       <title>Msmtp</title>
>       <para>óÁÊÔ ÐÒÏÅËÔÁ:
>         <ulink 
>-          url="http://msmtp.sourceforge.net">msmtp.sourceforge.net</ulink>
>+          url="http://msmtp.sourceforge.net">http://msmtp.sourceforge.net</ulink>
>       </para>
>       <para>óÏÚÄÁÊÔÅ ÆÁÊÌ <filename>~/.msmtprc</filename>:
>       
> <screen>
>-&prompt; <userinput>touch ~/.msmtprc</userinput>
>+&prompt; touch ~/.msmtprc
> </screen></para>
> 
>       <example><title>ðÒÉÍÅÒ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ .msmtprc</title>
>@@ -1189,31 +1170,27 @@
> # ---------------------------
> # õÞ£ÔÎÁÑ ÚÁÐÉÓØ ÐÏ ÕÍÏÌÞÁÎÉÀ
> # ---------------------------
>-
> account default
>-host smtp.work_host.ru		# smtp-ÓÅÒ×ÅÒ
>-from login@work_host.ru		# e-mail
>-user login			# ÌÏÇÉÎ
>-password pass			# ÐÁÒÏÌØ
>-
>+host smtp.work_host.ru       # smtp-ÓÅÒ×ÅÒ
>+from login@work_host.ru      # e-mail
>+user login                   # ÌÏÇÉÎ
>+password pass                # ÐÁÒÏÌØ
> # ------------------------
> # ìÏËÁÌØÎÁÑ ÕÞ£ÔÎÁÑ ÚÁÐÉÓØ
> # ------------------------
>-account local			# ÉÍÑ ÕÞÅÔÎÏÊ ÚÁÐÉÓÉ
>-host localhost			# ÉÓÐÏÌØÚÕÅÔÓÑ ÌÏËÁÌØÎÙÊ smtp-ÓÅÒ×ÅÒ
>-from user_name@hostname.ru	# e-mail
>-
>+account local                # ÉÍÑ ÕÞ£ÔÎÏÊ ÚÁÐÉÓÉ
>+host localhost               # ÉÓÐÏÌØÚÕÅÔÓÑ ÌÏËÁÌØÎÙÊ smtp-ÓÅÒ×ÅÒ
>+from user_name@hostname.ru   # e-mail
> # ---------------------------------------------------------------
> # õÞ£ÔÎÁÑ ÚÁÐÉÓØ ÐÒÏ×ÁÊÄÅÒÁ Ó ÁÕÔÅÎÔÉÆÉËÁÃÉÅÊ CRAM-MD5. ðÏÒÔ 2500
> # ---------------------------------------------------------------
>-
>-account provider		# ÉÍÑ ÕÞÅÔÎÏÊ ÚÁÐÉÓÉ
>-host mail.super_provider.ru	# smtp-ÓÅÒ×ÅÒ
>-port 2500			# ÐÏÒÔ
>-from login@super_provider.ru	# e-mail
>-auth cram-md5			# ÁÕÔÅÎÔÉÆÉËÁÃÉÑ CRAM-MD5
>-user login			# ÌÏÇÉÎ
>-password "pass"			# ÐÁÒÏÌØ
>+account provider             # ÉÍÑ ÕÞ£ÔÎÏÊ ÚÁÐÉÓÉ
>+host mail.super_provider.ru  # smtp-ÓÅÒ×ÅÒ
>+port 2500                    # ÐÏÒÔ
>+from login@super_provider.ru # e-mail
>+auth cram-md5                # ÁÕÔÅÎÔÉÆÉËÁÃÉÑ CRAM-MD5
>+user login                   # ÌÏÇÉÎ
>+password "pass"              # ÐÁÒÏÌØ
> </programlisting></example>
> 
>       <para>÷ <filename>~/.muttrc</filename> ÎÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ ÓÌÅÄÕÀÝÕÀ 
>@@ -1239,7 +1216,7 @@
> <section id="&BASEID;.chap_06">
>   <title>áÄÒÅÓÎÁÑ ËÎÉÇÁ</title>
>   <para>óÁÊÔ ÐÒÏÅËÔÁ:
>-    <ulink url="http://abook.sourceforge.net">abook.sourceforge.net</ulink>
>+    <ulink url="http://abook.sourceforge.net">http://abook.sourceforge.net</ulink>
>   </para>
>   
>   <para>éÔÁË, ×ÁÛÁ ÓÉÓÔÅÍÁ ÕÖÅ ÐÏÚ×ÏÌÑÅÔ ÐÏÌÕÞÁÔØ, ÓÏÒÔÉÒÏ×ÁÔØ, ÞÉÔÁÔØ, ÐÉÓÁÔØ 
>@@ -1250,9 +1227,7 @@
>     
>   <para>úÁÐÕÓËÁÊÔÅ <application>abook</application>:
>   
>-<screen>
>-&prompt; <userinput>abook</userinput>
>-</screen></para>
>+<screen>&prompt; abook</screen></para>
> 
>   <para>òÁÚÏÂÒÁÔØÓÑ × ÉÎÔÅÒÆÅÊÓÅ ÜÔÏÊ ÐÒÏÇÒÁÍÍÙ ÎÅ ÓÏÓÔÁ×ÉÔ ÔÒÕÄÁ.</para>
>   
>@@ -1281,19 +1256,13 @@
>     ÒÁÚÌÉÞÎÙÍÉ ÆÏÒÍÁÔÁÍÉ. îÁÐÒÉÍÅÒ, ×ÁÍ ÎÕÖÎÏ ÐÏÌÕÞÉÔØ HTML-×ÅÒÓÉÀ ×ÁÛÅÊ 
>     ÁÄÒÅÓÎÏÊ ËÎÉÇÉ. äÌÑ ÜÔÏÇÏ ×Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:
>     
>-<screen>
>-&prompt; <userinput>abook --convert abook .abook.addressbook html \
>-addressbook.html</userinput>
>-</screen></para>
>+<screen>&prompt; abook --convert abook .abook.addressbook html \
>+addressbook.html</screen></para>
> 
>   <para>óÉÎÔÁËÓÉÓ ÜÔÏÊ ËÏÍÁÎÄÙ:
>   
>-<screen>
>-<command>abook</command> <option>--convert</option> æÏÒÍÁÔ÷ÈÏÄÎÏÇÏæÁÊÌÁ ÷ÈÏÄÎÏÊæÁÊÌ æÏÒÍÁÔ÷ÙÈÏÄÎÏÇÏæÁÊÌÁ \
>-÷ÙÈÏÄÎÏÊæÁÊÌ
>-</screen></para>
>-
>-  <para>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÆÏÒÍÁÔÙ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ:</para>
>+<screen>abook --convert æÏÒÍÁÔ÷ÈÏÄÎÏÇÏæÁÊÌÁ ÷ÈÏÄÎÏÊæÁÊÌ æÏÒÍÁÔ÷ÙÈÏÄÎÏÇÏæÁÊÌÁ \
>+÷ÙÈÏÄÎÏÊæÁÊÌ</screen></para>
> 
>   <table id="abookin" frame="all">
>     <title>æÏÒÍÁÔÙ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ abook</title>
>@@ -1315,7 +1284,6 @@
>     </tgroup>
>   </table>
> 
>-  <para>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÆÏÒÍÁÔÙ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ:</para>
>   <table id="abookout" frame="all">
>     <title>æÏÒÍÁÔÙ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ abook</title>
>     <tgroup cols="2" align="left" colsep="1" rowsep="1">
>@@ -1348,8 +1316,9 @@
> 
> <section id="&BASEID;.chap_07">
>   <title>ûÉÆÒÏ×ÁÎÉÅ ÐÉÓÅÍ</title>
>+
>   <para>óÁÊÔ ÐÒÏÅËÔÁ: 
>-    <ulink url="http://www.gnupg.org">gnupg.org</ulink>
>+    <ulink url="http://www.gnupg.org">http://gnupg.org</ulink>
>   </para>
> 
> 
>     <para>éÍÐÏÒÔÉÒÏ×ÁÔØ ÞÅÊ-ÎÉÂÕÄØ ÏÔËÒÙÔÙÊ ËÌÀÞ ÐÏÚ×ÏÌÑÅÔ ËÏÍÁÎÄÁ:
> 
>-<screen>
>-&prompt; <userinput>gpg --import gpg-public-key.asc</userinput>
>-</screen></para>
>+<screen>&prompt; gpg --import gpg-public-key.asc</screen></para>
> 
>     <para>îÁÐÒÉÍÅÒ:
> 
> <screen>
>-&prompt; <userinput>gpg --import friend-key.asc</userinput>
>+&prompt; gpg --import friend-key.asc
> gpg: key 8421F11C: public key imported
> gpg: Total number processed: 1
> gpg:               imported: 1
>-</screen>
>-<screen>
>-&prompt; <userinput>gpg --list-keys</userinput>
>+&prompt; gpg --list-keys
> /home/alenitchev/.gnupg/pubring.gpg
> ------------------------
> pub  1024D/F18D5DDB 2004-12-11 Dmitri Alenitchev &lt;alenitchev@nm.ru&gt;
>@@ -1441,9 +1402,7 @@
>       ÏÔÐÒÁ×ËÏÊ ÎÁÖÉÍÁÊÔÅ ËÌÁ×ÉÛÕ <keycap>p</keycap>. ÷ÎÉÚÕ ÜËÒÁÎÁ ×Ù 
>       Õ×ÉÄÉÔÅ ÐÒÉÇÌÁÛÅÎÉÅ:
> 
>-<screen>
>-(e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (f)ÏÔËÁÚÁÔØÓÑ?
>-</screen></para>
>+<screen>(e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (f)ÏÔËÁÚÁÔØÓÑ?</screen></para>
> 
>     <para>úÁÛÉÆÒÕÊÔÅ Ó×Ï£ ÓÏÏÂÝÅÎÉÅ É ÏÔÐÒÁ×ÌÑÊÔÅ ÁÄÒÅÓÁÔÕ. ðÏÓÌÅ ÔÏÇÏ ËÁË ×Ù 
>       ÎÁÖÍ£ÔÅ <keycap>y</keycap> ÄÌÑ ÏÔÐÒÁ×ËÉ ÐÉÓØÍÁ, ×ÁÍ ÂÕÄÅÔ ÐÒÅÄÌÏÖÅÎÏ 
>@@ -1548,7 +1507,6 @@
> # --------------
> # óÐÁÍ-ÚÁÇÏÌÏ×ËÉ
> # --------------
>-
> # ðÉÓØÍÁ Ó ÚÁÇÏÌÏ×ËÁÍÉ X-Advertisement
> :0:
> * ^X-Advertisement:.*
>@@ -1573,7 +1531,6 @@
> :0:
> * !^To: .*
> $SPAM
>-
> # ---------- Spam Filters ---------- #
> </programlisting></para>
> 
>@@ -1583,6 +1540,7 @@
>         <filename>/dev/null</filename>). åÓÌÉ ×ÁÓ ÜÔÏ ÎÅ ÕÓÔÒÁÉ×ÁÅÔ, ÔÏ ÚÁÍÅÎÉÔÅ 
>         <filename>/dev/null</filename> ÎÁ <filename>$SPAM</filename> ÉÌÉ 
>         ËÁËÏÊ-ÎÉÂÕÄØ ÄÒÕÇÏÊ ÆÁÊÌ.</para>
>+      </note>
>       
>       <para>îÁÄÅÀÓØ, ×Ù ÐÏÎÑÌÉ, ÞÔÏ ÐÒÉ×ÅÄ£ÎÎÙÅ ×ÙÛÅ ÐÒÁ×ÉÌÁ ÎÅ Ñ×ÌÑÀÔÓÑ 
>         ËÁËÉÍ-ÌÉÂÏ ÜÔÁÌÏÎÏÍ. üÔÏ ÌÉÛØ ÔÏ, ÞÔÏ ÐÏÍÏÇÁÅÔ ÍÎÅ × ÂÏÒØÂÅ ÓÏ ÓÐÁÍÏÍ. 
>@@ -1607,4 +1565,21 @@
>       ÐÏ×ÏÄÕ ÔÏÇÏ, ËÁËÉÍ ×Ù ÈÏÔÉÔÅ ×ÉÄÅÔØ ÅÇÏ ÄÁÌØÎÅÊÛÅÅ ÒÁÚ×ÉÔÉÅ.</para>
> 
>   </section>
>-</section>
>\ ÷ ËÏÎÃÅ ÆÁÊÌÁ ÎÅÔ ÎÏ×ÏÊ ÓÔÒÏËÉ
>+</section>
>+
>

Actions: View | Diff

Attachments on bug 9279: 1432 | 1433 | 1434 | 1435