Merge branch 'master' into epel7

2016-07-02 19:49:52 +01:00 · 2016-07-02 19:49:52 +01:00 · 950c07b784
parent a9d27fe9fb 5ec8cd647d
commit 950c07b784
3 changed files with 3 additions and 3 deletions
--- a/README.dynamic
+++ b/README.dynamic
--- a/nginx.conf
+++ b/nginx.conf
@ -7,7 +7,7 @@ worker_processes auto;
 error_log /var/log/nginx/error.log;
 pid /run/nginx.pid;

-# Load dynamic modules. See /usr/share/nginx/README.fedora.
+# Load dynamic modules. See /usr/share/nginx/README.dynamic.
 include /usr/share/nginx/modules/*.conf;

 events {
--- a/nginx.spec
+++ b/nginx.spec
@ -36,7 +36,7 @@ Source101:         poweredby.png
 Source102:         nginx-logo.png
 Source103:         404.html
 Source104:         50x.html
-Source200:         README.fedora
+Source200:         README.dynamic
 Source210:         UPGRADE-NOTES-1.6-to-1.10

 # removes -Werror in upstream build scripts.  -Werror conflicts with
@ -356,7 +356,7 @@ fi

 %files
 %license LICENSE
-%doc CHANGES README README.fedora
+%doc CHANGES README README.dynamic
 %if 0%{rhel} == 7
 %doc UPGRADE-NOTES-1.6-to-1.10
 %endif