# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1623339272 -10800
# Node ID 48004177276d313f00404c6a9e9722972658a9e7
# Parent  ff357b676c2e8146dae8af03d96e6a927324667b
Reordered methods in imap_auth and smtp_auth.

The "LOGIN" SASL mechanism is obsolete and expected to be only used for
compatibility.  Accordingly, the corresponding "login" method is now listed
after the "plain" method.

diff --git a/xml/en/docs/mail/ngx_mail_imap_module.xml b/xml/en/docs/mail/ngx_mail_imap_module.xml
--- a/xml/en/docs/mail/ngx_mail_imap_module.xml
+++ b/xml/en/docs/mail/ngx_mail_imap_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_mail_imap_module"
         link="/en/docs/mail/ngx_mail_imap_module.html"
         lang="en"
-        rev="5">
+        rev="6">
 
 <section id="directives" name="Directives">
 
@@ -25,16 +25,16 @@ Sets permitted methods of authentication
 Supported methods are:
 <list type="tag">
 
+<tag-name><literal>plain</literal></tag-name>
+<tag-desc>
+<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link>
+</tag-desc>
+
 <tag-name><literal>login</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH=LOGIN</link>
 </tag-desc>
 
-<tag-name><literal>plain</literal></tag-name>
-<tag-desc>
-<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link>
-</tag-desc>
-
 <tag-name><literal>cram-md5</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/rfc2195">AUTH=CRAM-MD5</link>.
diff --git a/xml/en/docs/mail/ngx_mail_smtp_module.xml b/xml/en/docs/mail/ngx_mail_smtp_module.xml
--- a/xml/en/docs/mail/ngx_mail_smtp_module.xml
+++ b/xml/en/docs/mail/ngx_mail_smtp_module.xml
@@ -10,13 +10,13 @@
 <module name="Module ngx_mail_smtp_module"
         link="/en/docs/mail/ngx_mail_smtp_module.html"
         lang="en"
-        rev="6">
+        rev="7">
 
 <section id="directives" name="Directives">
 
 <directive name="smtp_auth">
 <syntax><value>method</value> ...</syntax>
-<default>login plain</default>
+<default>plain login</default>
 <context>mail</context>
 <context>server</context>
 
@@ -27,16 +27,16 @@ for SMTP clients.
 Supported methods are:
 <list type="tag">
 
+<tag-name><literal>plain</literal></tag-name>
+<tag-desc>
+<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link>
+</tag-desc>
+
 <tag-name><literal>login</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH LOGIN</link>
 </tag-desc>
 
-<tag-name><literal>plain</literal></tag-name>
-<tag-desc>
-<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link>
-</tag-desc>
-
 <tag-name><literal>cram-md5</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/rfc2195">AUTH CRAM-MD5</link>.
diff --git a/xml/ru/docs/mail/ngx_mail_imap_module.xml b/xml/ru/docs/mail/ngx_mail_imap_module.xml
--- a/xml/ru/docs/mail/ngx_mail_imap_module.xml
+++ b/xml/ru/docs/mail/ngx_mail_imap_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_mail_imap_module"
         link="/ru/docs/mail/ngx_mail_imap_module.html"
         lang="ru"
-        rev="5">
+        rev="6">
 
 <section id="directives" name="Директивы">
 
@@ -25,16 +25,16 @@
 Поддерживаемые методы:
 <list type="tag">
 
+<tag-name><literal>plain</literal></tag-name>
+<tag-desc>
+<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link>
+</tag-desc>
+
 <tag-name><literal>login</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH=LOGIN</link>
 </tag-desc>
 
-<tag-name><literal>plain</literal></tag-name>
-<tag-desc>
-<link url="https://tools.ietf.org/html/rfc4616">AUTH=PLAIN</link>
-</tag-desc>
-
 <tag-name><literal>cram-md5</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/rfc2195">AUTH=CRAM-MD5</link>.
diff --git a/xml/ru/docs/mail/ngx_mail_smtp_module.xml b/xml/ru/docs/mail/ngx_mail_smtp_module.xml
--- a/xml/ru/docs/mail/ngx_mail_smtp_module.xml
+++ b/xml/ru/docs/mail/ngx_mail_smtp_module.xml
@@ -10,13 +10,13 @@
 <module name="Модуль ngx_mail_smtp_module"
         link="/ru/docs/mail/ngx_mail_smtp_module.html"
         lang="ru"
-        rev="6">
+        rev="7">
 
 <section id="directives" name="Директивы">
 
 <directive name="smtp_auth">
 <syntax><value>метод</value> ...</syntax>
-<default>login plain</default>
+<default>plain login</default>
 <context>mail</context>
 <context>server</context>
 
@@ -27,16 +27,16 @@ SMTP-клиентов.
 Поддерживаемые методы:
 <list type="tag">
 
+<tag-name><literal>plain</literal></tag-name>
+<tag-desc>
+<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link>
+</tag-desc>
+
 <tag-name><literal>login</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/draft-murchison-sasl-login-00">AUTH LOGIN</link>
 </tag-desc>
 
-<tag-name><literal>plain</literal></tag-name>
-<tag-desc>
-<link url="https://tools.ietf.org/html/rfc4616">AUTH PLAIN</link>
-</tag-desc>
-
 <tag-name><literal>cram-md5</literal></tag-name>
 <tag-desc>
 <link url="https://tools.ietf.org/html/rfc2195">AUTH CRAM-MD5</link>.