SRS: fix mismerge

[exim.git] / src / README

diff --git a/src/README b/src/README
index c8ecaa0cb70cb99b82146713ab8ace67025c9e7b..e335cc22e5e96c4e726c89bdde329715e0e90d22 100644 (file)
--- a/src/README
+++ b/src/README
@@ -1,7 +1,8 @@
 THE EXIM MAIL TRANSFER AGENT VERSION 4
 --------------------------------------
 
 THE EXIM MAIL TRANSFER AGENT VERSION 4
 --------------------------------------
 

-Copyright (c) 1995 - 2005 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",


@@ -14,7 +15,7 @@ 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.
 
 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.
 

-There is a web site at http://www.exim.org; this contains details of the
+There is a website at https://www.exim.org; this contains details of the

 mailing list exim-users@exim.org.
 
 A copy of the Exim FAQ should be available from the same source that you used
 mailing list exim-users@exim.org.
 
 A copy of the Exim FAQ should be available from the same source that you used


@@ -47,7 +48,7 @@ Please see the documentation files for full instructions on how to build,
 install, and run Exim. For straightforward installations on operating systems
 to which Exim has already been ported, the building process is as follows:
 
 install, and run Exim. For straightforward installations on operating systems
 to which Exim has already been ported, the building process is as follows:
 

-. Ensure that the top-level Exim directory (e.g. exim-4.40) is the current
+. Ensure that the top-level Exim directory (e.g. exim-4.80) is the current

   directory (containing the files and directories listed above).
 
 . Edit the file called src/EDITME and put the result in a new file called
   directory (containing the files and directories listed above).
 
 . Edit the file called src/EDITME and put the result in a new file called


@@ -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


@@ -331,7 +333,7 @@ also need to add a new alias definition: "alias utf8 utf-8".
 
 2. For some strange reason make will fail at building "exim_dbmbuild" when
    called the first time. However simply calling make a second time will solve
 
 2. For some strange reason make will fail at building "exim_dbmbuild" when
    called the first time. However simply calling make a second time will solve

-   the problem. Alternatively, run "make makfile" and then "make".
+   the problem. Alternatively, run "make makefile" and then "make".

 
 
 ******* IMPORTANT FOR ULTRIX USERS *******
 
 
 ******* IMPORTANT FOR ULTRIX USERS *******