LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / src / README

diff --git a/src/README b/src/README
index 225295efb3adf926c2edf7fea36cf8fab26b568c..768eabbe820ee451fe0c5b9598446c9aae6ed9c8 100644 (file)
--- a/src/README
+++ b/src/README
@@ -2,6 +2,7 @@ THE EXIM MAIL TRANSFER AGENT VERSION 4
 --------------------------------------
 
 Copyright (c) 1995 - 2018 University of Cambridge.
 --------------------------------------
 
 Copyright (c) 1995 - 2018 University of Cambridge.

+SPDX-License-Identifier: GPL-2.0-or-later

 See the file NOTICE for conditions of use and distribution.
 
 There is a book about Exim by Philip Hazel called "The Exim SMTP Mail Server",
 See the file NOTICE for conditions of use and distribution.
 
 There is a book about Exim by Philip Hazel called "The Exim SMTP Mail Server",


@@ -9,7 +10,7 @@ published by UIT Cambridge in May 2003. This is the official guide for Exim 4.
 The current edition covers release 4.10 and a few later extensions.
 
 The O'Reilly book about Exim ("Exim The Mail Transfer Agent" by Philip Hazel)
 The current edition covers release 4.10 and a few later extensions.
 
 The O'Reilly book about Exim ("Exim The Mail Transfer Agent" by Philip Hazel)

-covers Exim 3, which is now deprecated. Exim 4 has a large number of changes
+covers Exim 3, which is now obsolete. Exim 4 has a large number of changes

 from Exim 3, though the basic structure and philosophy remains the same. The
 older book may be helpful for the background, but a lot of the detail has
 changed, so it is likely to be confusing to newcomers.
 from Exim 3, though the basic structure and philosophy remains the same. The
 older book may be helpful for the background, but a lot of the detail has
 changed, so it is likely to be confusing to newcomers.


@@ -150,6 +151,7 @@ system and architecture types respectively, the files used are:
   Local/Makefile-<ostype>
   Local/Makefile-<archtype>
   Local/Makefile-<ostype>-<archtype>
   Local/Makefile-<ostype>
   Local/Makefile-<archtype>
   Local/Makefile-<ostype>-<archtype>

+  Local/Makefile-<buildname>

   OS/Makefile-Base
 
 Of the Local/* files, only Local/Makefile is required to exist; the rest are
   OS/Makefile-Base
 
 Of the Local/* files, only Local/Makefile is required to exist; the rest are