diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-02 16:46:52 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-02 16:46:52 +0100 |
commit | f1cf5534370c5e82d0e3117c65e04840112ee44c (patch) | |
tree | 0fef43e69b7fdc229844b8038a5c752f725b3e74 | |
parent | b20362c24b673baf4143410e25181d05f4b940d2 (diff) | |
parent | 8c04944b66fd4a4fa88e54b65a2391397998c51d (diff) | |
download | php-git-f1cf5534370c5e82d0e3117c65e04840112ee44c.tar.gz |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Update year to 2021
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | ext/oci8/LICENSE | 2 | ||||
-rw-r--r-- | ext/phar/phar.1.in | 2 | ||||
-rw-r--r-- | sapi/cli/php.1.in | 2 | ||||
-rw-r--r-- | sapi/fpm/php-fpm.8.in | 2 | ||||
-rw-r--r-- | sapi/phpdbg/phpdbg.1.in | 2 | ||||
-rw-r--r-- | scripts/man1/php-config.1.in | 2 | ||||
-rw-r--r-- | scripts/man1/phpize.1.in | 2 |
8 files changed, 8 insertions, 8 deletions
@@ -1,6 +1,6 @@ -------------------------------------------------------------------- The PHP License, version 3.01 -Copyright (c) 1999 - 2019 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2021 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/ext/oci8/LICENSE b/ext/oci8/LICENSE index 4076fe994f..6a15be5885 100644 --- a/ext/oci8/LICENSE +++ b/ext/oci8/LICENSE @@ -1,6 +1,6 @@ -------------------------------------------------------------------- The PHP License, version 3.01 -Copyright (c) 1999 - 2019 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2021 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in index e8e38c8942..2a98fafd0c 100644 --- a/ext/phar/phar.1.in +++ b/ext/phar/phar.1.in @@ -1,4 +1,4 @@ -.TH PHAR 1 "2019" "The PHP Group" "User Commands" +.TH PHAR 1 "2021" "The PHP Group" "User Commands" .SH NAME phar, phar.phar \- PHAR (PHP archive) command line tool .SH SYNOPSIS diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 400f7b000f..1f9d92f36c 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@php 1 "2019" "The PHP Group" "Scripting Language" +.TH @program_prefix@php 1 "2021" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@php \- PHP Command Line Interface 'CLI' .P diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index edff796061..972c242614 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -1,4 +1,4 @@ -.TH PHP-FPM 8 "2019" "The PHP Group" "Scripting Language" +.TH PHP-FPM 8 "2021" "The PHP Group" "Scripting Language" .SH NAME .TP 15 php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' diff --git a/sapi/phpdbg/phpdbg.1.in b/sapi/phpdbg/phpdbg.1.in index 357a50b727..bf6a7cd483 100644 --- a/sapi/phpdbg/phpdbg.1.in +++ b/sapi/phpdbg/phpdbg.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@phpdbg 1 "2019" "The PHP Group" "Scripting Language" +.TH @program_prefix@phpdbg 1 "2021" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@phpdbg \- The interactive PHP debugger .SH SYNOPSIS diff --git a/scripts/man1/php-config.1.in b/scripts/man1/php-config.1.in index 23aef10f7c..dc1317b503 100644 --- a/scripts/man1/php-config.1.in +++ b/scripts/man1/php-config.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@php\-config 1 "2019" "The PHP Group" "Scripting Language" +.TH @program_prefix@php\-config 1 "2021" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@php\-config \- get information about PHP configuration and compile options .SH SYNOPSIS diff --git a/scripts/man1/phpize.1.in b/scripts/man1/phpize.1.in index 42530acbde..62613d347c 100644 --- a/scripts/man1/phpize.1.in +++ b/scripts/man1/phpize.1.in @@ -1,4 +1,4 @@ -.TH @program_prefix@phpize 1 "2019" "The PHP Group" "Scripting Language" +.TH @program_prefix@phpize 1 "2021" "The PHP Group" "Scripting Language" .SH NAME @program_prefix@phpize \- prepare a PHP extension for compiling .SH SYNOPSIS |