← Back to branch summary

~ubuntu-branches/ubuntu/vivid/exim4/vivid

« back to all changes in this revision

Viewing changes to doc/OptionLists.txt

  • Committer: Package Import Robot
  • Author(s): Corey Bryant
  • Date: 2014-08-04 11:48:39 UTC
  • mfrom: (56.1.2 utopic)
  • Revision ID: package-import@ubuntu.com-20140804114839-xoulpcx9nxi5m72u
Tags: 4.84~RC1-3ubuntu1
https://launchpad.net/bugs/1351470
* Merge from Debian unstable (LP: #1351470). Remaining changes:
  - Show Ubuntu distribution on smtp:
    + debian/patches/fix_smtp_banner.patch: updated SMTP banner
      with Ubuntu distribution
    + debian/control: added lsb-release build dependency
  - Don't provide default-mta; in Ubuntu, we want postfix to be the
    default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/OptionLists.txt
180
180
dns_check_names_pattern              string          +             main              2.11
181
181
dns_csa_search_limit                 integer         5             main              4.60
182
182
dns_csa_use_reverse                  boolean         true          main              4.60
 
183
dns_dnssec_ok                        integer         -1            main              4.82
183
184
dns_ipv4_lookup                      boolean         false         main              3.20
184
185
dns_qualify_single                   boolean         true          smtp
185
186
dns_retrans                          time            0s            main              1.60
186
187
dns_retry                            integer         0             main              1.60
187
188
dns_search_parents                   boolean         false         smtp
188
 
dns_use_dnssec                       integer         -1            main              4.82
189
189
dns_use_edns0                        integer         -1            main              4.76
190
190
domains                              domain list     unset         routers           4.00
191
191
driver                               string          unset         authenticators
714
714
-oMai          # Supply authenticated id
715
715
-oMas          # Supply authenticated sender
716
716
-oMi           # Supply interface address
 
717
-oMm           # Supply message reference
717
718
-oMr           # Supply protocol name
718
719
-oMs           # Supply host name
719
720
-oMt           # Supply ident string