Attachment 1430 Details for Bug 9243 – postfix.xml.diff

[patch] postfix.xml.diff

postfix.xml.diff (text/plain), 6.50 KB, created by Dmitry V. Levin on 2006-03-17 05:06:08 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry V. Levin

Created: 2006-03-17 05:06:08 MSK

Size: 6.50 KB

patch

obsolete

>diff -upk.orig postfix.kirill.060314.orig/doc/postfix.xml postfix.kirill.060314/doc/postfix.xml
>--- postfix.kirill.060314.orig/doc/postfix.xml	2006-03-14 19:05:47 +0300
>+++ postfix.kirill.060314/doc/postfix.xml	2006-03-17 04:57:19 +0300
>@@ -74,7 +74,7 @@
>     &ALTLINUX;. üÔÏ ÏÂßÑÓÎÑÅÔÓÑ ÔÅÍ, ÞÔÏ × &UNIX;-ÐÏÄÏÂÎÙÈ ÓÉÓÔÅÍÁÈ
>     ×ÏÚÍÏÖÎÏÓÔØ ÏÔÐÒÁ×ÌÑÔØ ÐÏÞÔÕ Ó ÐÏÍÏÝØÀ ÐÒÏÓÔÏÇÏ ×ÙÚÏ×Á ËÏÍÁÎÄÙ ÉÚ
>     ËÏÍÁÎÄÏÊ ÏÂÏÌÏÞËÉ ÐÒÁËÔÉÞÅÓËÉ ÏÂÑÚÁÔÅÌØÎÁ. îÅËÏÔÏÒÙÅ ÐÒÏÇÒÁÍÍÙ
>-    (ÎÁÐÒÉÍÅÒ, ÓÅÒ×ÉÓ <application>cron</application>) ÐÏÌØÚÕÀÔÓÑ ÜÔÉÍ
>+    (ÎÁÐÒÉÍÅÒ, ÓÅÒ×ÉÓ <application>crond</application>) ÐÏÌØÚÕÀÔÓÑ ÜÔÉÍ
>     ÄÌÑ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÊ ÐÏÌØÚÏ×ÁÔÅÌÑÍ. ðÅÒÅÓÙÌËÏÊ ×ÓÅÊ ÜÌÅËÔÒÏÎÎÏÊ
>     ÐÏÞÔÙ, ÐÒÏÈÏÄÑÝÅÊ ÞÅÒÅÚ ÍÁÛÉÎÕ, ÚÁÎÉÍÁÅÔÓÑ <acronym>MTA</acronym>
>     (Mail Transport Agent), × ÎÁÛÅÍ ÓÌÕÞÁÅ ÜÔÏ &POSTFIX;. èÏÔÑ
>@@ -107,12 +107,11 @@
>       <command>control postfix server</command>. ðÏ ÕÍÏÌÞÁÎÉÀ ÐÏÓÌÅ
>       ÕÓÔÁÎÏ×ËÉ ÓÌÕÖÂÁ postfix ÎÁÈÏÄÉÔÓÑ × ÒÅÖÉÍÅ
>       <command>local</command>, × ËÏÔÏÒÏÍ postfix ÎÅ ÐÒÉÎÉÍÁÅÔ
>-      ÓÏÅÄÉÎÅÎÉÊ ÉÚ ÓÅÔÉ É ×ÏÏÂÝÅ ÎÅ ÉÓÐÏÌØÚÕÅÔ ÓÅÔØ ÄÌÑ ÄÏÓÔÁ×ËÉ
>-      ÐÏÞÔÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ, ÏÇÒÁÎÉÞÉ×ÁÑÓØ ÓÏÅÄÉÎÅÎÉÅÍ ÐÏÓÒÅÄÓÔ×ÏÍ
>-      ÓÏËÅÔÏ× ÓÅÍÅÊÓÔ×Á UNIX (UNIX-domain socket). äÌÑ ÂÏÌØÛÉÎÓÔ×Á
>-      ÒÁÂÏÞÉÈ ÓÔÁÎÃÉÊ ÒÁÂÏÔÁ × ÒÅÖÉÍÅ SMTP-ÓÅÒ×ÅÒÁ ÎÅ ÔÒÅÂÕÅÔÓÑ (É
>-      ÎÅÖÅÌÁÔÅÌØÎÁ Ó ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ), Á × ËÁÞÅÓÔ×Å
>-      SMTP-ÓÅÒ×ÅÒ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ËÁËÏÊ-ÔÏ ×ÎÅÛÎÉÊ ÕÚÅÌ ÓÅÔÉ.
>+      ÓÏÅÄÉÎÅÎÉÊ ÉÚ ÓÅÔÉ, ÏÇÒÁÎÉÞÉ×ÁÑÓØ ÐÒÉ£ÍÏÍ ÌÏËÁÌØÎÙÈ ÓÏÅÄÉÎÅÎÉÊ
>+      ÐÏÓÒÅÄÓÔ×ÏÍ ÓÏËÅÔÏ× ÓÅÍÅÊÓÔ×Á UNIX (UNIX-domain socket). äÌÑ
>+      ÂÏÌØÛÉÎÓÔ×Á ÒÁÂÏÞÉÈ ÓÔÁÎÃÉÊ ÒÁÂÏÔÁ × ÒÅÖÉÍÅ SMTP-ÓÅÒ×ÅÒÁ ÎÅ
>+      ÔÒÅÂÕÅÔÓÑ (É ÎÅÖÅÌÁÔÅÌØÎÁ Ó ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ), Á × ËÁÞÅÓÔ×Å
>+      SMTP-ÓÅÒ×ÅÒÁ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ËÁËÏÊ-ÔÏ ×ÎÅÛÎÉÊ ÕÚÅÌ ÓÅÔÉ.
>     </para>
> 
>   </section>
>@@ -145,8 +144,7 @@
>       ÓÅÒ×ÅÒÕ ÒÁÂÏÔÁÔØ × ÐÒÅÄÅÌÁÈ ÍÁÛÉÎÙ, Á ÔÁËÖÅ ÒÁÚ×£ÒÎÕÔÙÅ
>       ËÏÍÍÅÎÔÁÒÉÉ Ó ÐÒÉÍÅÒÁÍÉ. åÓÌÉ ×Ù ÉÚÍÅÎÉÌÉ ËÏÎÆÉÇÕÒÁÃÉÀ ÐÒÉ
>       ÒÁÂÏÔÁÀÝÅÍ &POSTFIX;, Å£ ÎÕÖÎÏ ÁËÔÉ×ÉÚÉÒÏ×ÁÔØ ËÏÍÁÎÄÏÊ
>-      <command>service postfix reload</command> ÉÌÉ ÐÒÏÓÔÏ
>-      <command>postfix reload</command>.
>+      <command>service postfix reload</command>.
>     </para>
>   </section>
> 
>@@ -222,6 +220,7 @@
>       ÏÔËÌÀÞÉÔØ ÁÇÅÎÔÙ <literal>local</literal> É
>       <literal>smtp</literal> × ÆÁÊÌÅ
>       <filename>/etc/postfix/master.cf</filename>.
>+      
>     </para>
>   </section>
> 
>@@ -251,16 +250,16 @@
>       ÎÅÄÏÓÔÁÔÏË ÜÔÏÇÏ ÒÁÓÛÉÒÅÎÉÑ &mdash; ×ËÌÀÞÅÎÉÅ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ, × ÍÅÎØÛÅÊ
>       ÓÔÅÐÅÎÉ ÐÒÏ×ÅÒÅÎÎÏÇÏ × ÐÌÁÎÅ ÂÅÚÏÐÁÓÎÏÓÔÉ. îÁÓÔÒÏÊËÁ
>       ÁÕÔÅÎÔÉÆÉËÁÃÉÉ <acronym>TLS/SASL</acronym> ÏÐÉÓÁÎÁ × ÆÁÊÌÁÈ
>-      <filename>TSL_README</filename> <filename>SASL_README</filename> × ÄÏËÕÍÅÎÔÁÃÉÉ &POSTFIX;.
>+      <filename>TSL_README</filename> É <filename>SASL_README</filename> × ÄÏËÕÍÅÎÔÁÃÉÉ &POSTFIX;.
>     </para>
>     <para>
>-      ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÇÌÏÂÁÌØÎÙÈ ÁÄÒÅÓÏ× × ÌÏËÁÌØÎÙÅ
>+      ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÇÌÏÂÁÌØÎÙÈ ÐÏÞÔÏ×ÙÈ ÁÄÒÅÓÏ× × ÌÏËÁÌØÎÙÅ
>       ÁÄÒÅÓÁ ÎÁÚÎÁÞÅÎÉÑ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ Ó ÐÏÍÏÝØÀ ÔÁÂÌÉÃ ÔÉÐÁ <literal
>       moreinfo="refentry">virtual</literal>
>       (ÓÍ.
>       <citerefentry><refentrytitle>virtual</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
>     </para>
>-    <screen>virtual_maps = hash:/etc/postfix/virtual</screen>
>+    <screen>virtual_alias_maps = cdb:/etc/postfix/virtual</screen>
>     <para>
>       ðÒÉÍÅÒ ÓÏÄÅÒÖÉÍÏÇÏ <filename>/etc/postfix/virtual</filename>:
>     </para>
>@@ -271,8 +270,8 @@
>       @domain2.ru user3
>     </screen>
>     <para>
>-      ðÏÓÌÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÏÔÔÒÁÎÓÌÉÒÕÊÔÅ ÔÁÂÌÉÃÕ × ÒÁÂÏÞÉÊ ÏÂÒÁÚ
>-      ËÏÍÁÎÄÏÊ <command>postmap /etc/postfix/virtual</command>.
>+      ðÏÓÌÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÎÅ ÚÁÂÕÄØÔÅ ÁËÔÉ×ÉÚÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ËÏÍÁÎÄÏÊ
>+      <command>service postfix reload</command>.
>     </para>
>     <para>
>       åÓÌÉ ËÁËÉÍ-ÌÉÂÏ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÓÅÔÉ ÐÏÞÔÁ ÄÏÌÖÎÁ ÄÏÓÔÁ×ÌÑÔØÓÑ ÐÏ
>@@ -294,8 +293,8 @@
>       <citerefentry><refentrytitle>aliases</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
>     </para>
>     <screen>
>-      alias_maps = hash:/etc/postfix/aliases
>-      alias_database = hash:/etc/postfix/aliases 
>+      alias_maps = cdb:/etc/postfix/aliases
>+      alias_database = cdb:/etc/postfix/aliases 
>     </screen>
>     <para>
>       ðÒÉ ÕÓÔÁÎÏ×ËÅ &POSTFIX; <quote>Ó ÎÕÌÑ</quote> × ÜÔÏÊ ÔÁÂÌÉÃÅ
>@@ -321,11 +320,11 @@
>       filebox: /dir/file
>     </screen>
>     <para>
>-      òÁÂÏÞÉÊ ÏÂÒÁÚ ÔÁÂÌÉÃÙ ÓÔÒÏÉÔÓÑ Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄ
>-      <command>postalias /etc/postfix/aliases</command> ÉÌÉ
>-      <command>newaliases</command>. ðÒÉ ÏÔÐÒÁ×ËÅ ÓÏÏÂÝÅÎÉÑ
>-      &POSTFIX; ÇÅÎÅÒÉÒÕÅÔ ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ ÉÚ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ
>-      É ÓÏÂÓÔ×ÅÎÎÏÇÏ ÄÏÍÅÎÁ (ÉÌÉ ÚÎÁÞÅÎÉÑ
>+      òÁÂÏÞÉÊ ÏÂÒÁÚ ÔÁÂÌÉÃÙ ÓÔÒÏÉÔÓÑ Ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ
>+      <command>newaliases</command>, Á ÔÁËÖÅ ÐÒÉ ÁËÔÕÁÌÉÚÁÃÉÉ ×ÓÅÈ
>+      ÉÚÍÅÎÅÎÉÊ ÐÏÓÒÅÄÓÔ×ÏÍ ËÏÍÁÎÄÙ <command>service postfix reload</command>.
>+      ðÒÉ ÏÔÐÒÁ×ËÅ ÓÏÏÂÝÅÎÉÑ &POSTFIX; ÇÅÎÅÒÉÒÕÅÔ ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ ÉÚ
>+      ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ É ÓÏÂÓÔ×ÅÎÎÏÇÏ ÄÏÍÅÎÁ (ÉÌÉ ÚÎÁÞÅÎÉÑ
>       <parameter>myorigin</parameter>). äÁÖÅ ÅÓÌÉ ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ
>       ×ÙÓÔÁ×ÉÌ ÚÁÇÏÌÏ×ÏË <literal>From:</literal>, ÜÔÏÔ ÁÄÒÅÓ ÐÏÐÁÄÁÅÔ
>       × ÓÌÕÖÅÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÓÏÏÂÝÅÎÉÑ É ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ
>@@ -336,7 +335,7 @@
>       <citerefentry><refentrytitle>canonical</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
>     </para>
>     <screen>
>-      sender_canonical_maps = hash:/etc/postfix/sender_canonical
>+      sender_canonical_maps = cdb:/etc/postfix/sender_canonical
>     </screen>
>     <para>
>       áÎÁÌÏÇÉÞÎÁÑ ÔÁÂÌÉÃÁ <literal>recipient_canonical</literal> É
>@@ -344,8 +343,7 @@
>       <parameter>recipient_canonical_maps</parameter> ÍÏÇÕÔ ÂÙÔØ
>       ÉÓÐÏÌØÚÏ×ÁÎÁ ÄÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÁÄÒÅÓÏ× ÎÁÚÎÁÞÅÎÉÑ. äÌÑ
>       ÁËÔÕÁÌÉÚÁÃÉÉ ÉÚÍÅÎÅÎÉÊ ÔÁÂÌÉÃ ÉÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ
>-      <command>postmap
>-      <replaceable>ÉÍÑ_ÔÁÂÌÉÃÙ</replaceable></command>.
>+      <command>service postfix reload</command>.
>     </para> 
>   </section>
> 
>@@ -381,7 +379,7 @@
>       <citerefentry><refentrytitle>access</refentrytitle><manvolnum>5</manvolnum></citerefentry>):
>     </para>
>     <screen>
>-      smtpd_client_restrictions = permit_mynetworks, hash:/etc/postfix/access
>+      smtpd_client_restrictions = permit_mynetworks, cdb:/etc/postfix/access
>     </screen>
>     <para>
>       ðÒÉÍÅÒ ÔÁÂÌÉÃÙ:
>@@ -394,8 +392,7 @@
>     </screen>
>     <para>
>       ëÁË É Ó ÄÒÕÇÉÍÉ ÔÁÂÌÉÃÁÍÉ, ÐÏÓÌÅ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÐÒÉ×ÅÄÉÔÅ
>-      ËÁÒÙ × ÄÅÊÓÔ×ÉÅ ËÏÍÁÎÄÏÊ <command>postmap
>-      /etc/postfix/access</command>.
>+      ËÁÒÙ × ÄÅÊÓÔ×ÉÅ ËÏÍÁÎÄÏÊ <command>service postfix reload</command>.
>     </para>
>   </section>
>

Actions: View | Diff

Attachments on bug 9243: 1428 | 1429 | 1430