From af7c1c875627d8552dda71dfef89557b9ee56231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Thu, 23 Sep 2021 00:28:41 +0200
Subject: [PATCH] Resolves: #2007019 - use proper wording in error pages

---
 404.html   | 19 ++++++++++---------
 50x.html   | 23 ++++++++++++-----------
 nginx.spec |  5 ++++-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/404.html b/404.html
index 71fa16c..c6014a7 100644
--- a/404.html
+++ b/404.html
@@ -27,7 +27,7 @@
                 text-align: center;
                 margin: 0;
                 padding: 0.6em 2em 0.4em;
-                background-color: #294172;
+                background-color: #900;
                 color: #fff;
                 font-weight: normal;
                 font-size: 1.75em;
@@ -39,13 +39,13 @@
             }
             h2 {
                 text-align: center;
-                background-color: #3C6EB4;
+                background-color: #900;
                 font-size: 1.1em;
                 font-weight: bold;
                 color: #fff;
                 margin: 0;
                 padding: 0.5em;
-                border-bottom: 2px solid #294172;
+                border-bottom: 2px solid #000;
             }
             h3 {
                 text-align: center;
@@ -92,7 +92,7 @@
                     <p>Something has triggered missing webpage on your
                     website. This is the default 404 error page for
                     <strong>nginx</strong> that is distributed with
-                    Fedora.  It is located
+                    Red Hat Enterprise Linux.  It is located
                     <tt>/usr/share/nginx/html/404.html</tt></p>
 
                     <p>You should customize this error page for your own
@@ -100,18 +100,19 @@
                     the <strong>nginx</strong> configuration file
                     <tt>/etc/nginx/nginx.conf</tt>.</p>
 
+                    <p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p>
+
                 </div>
             </div>
 
             <div class="logos">
                 <a href="http://nginx.net/"><img
-                    src="/nginx-logo.png"
+                    src="nginx-logo.png" 
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-
-                <a href="http://fedoraproject.org/"><img 
-                    src="/poweredby.png"
-                    alt="[ Powered by Fedora ]" 
+                <a href="http://www.redhat.com/"><img
+                    src="poweredby.png"
+                    alt="[ Powered by Red Hat Enterprise Linux ]"
                     width="88" height="31" /></a>
             </div>
         </div>
diff --git a/50x.html b/50x.html
index c296c61..5d8d957 100644
--- a/50x.html
+++ b/50x.html
@@ -27,7 +27,7 @@
                 text-align: center;
                 margin: 0;
                 padding: 0.6em 2em 0.4em;
-                background-color: #294172;
+                background-color: #900;
                 color: #fff;
                 font-weight: normal;
                 font-size: 1.75em;
@@ -39,13 +39,13 @@
             }
             h2 {
                 text-align: center;
-                background-color: #3C6EB4;
+                background-color: #900;
                 font-size: 1.1em;
                 font-weight: bold;
                 color: #fff;
                 margin: 0;
                 padding: 0.5em;
-                border-bottom: 2px solid #294172;
+                border-bottom: 2px solid #000;
             }
             h3 {
                 text-align: center;
@@ -89,10 +89,10 @@
             <div class="alert">
                 <h2>Website Administrator</h2>
                 <div class="content">
-                    <p>Something has triggered an error on your
-                    website.  This is the default error page for
+                    <p>Something has triggered missing webpage on your
+                    website. This is the default error page for
                     <strong>nginx</strong> that is distributed with
-                    Fedora.  It is located
+                    Red Hat Enterprise Linux.  It is located
                     <tt>/usr/share/nginx/html/50x.html</tt></p>
 
                     <p>You should customize this error page for your own
@@ -100,18 +100,19 @@
                     the <strong>nginx</strong> configuration file
                     <tt>/etc/nginx/nginx.conf</tt>.</p>
 
+                    <p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p>
+
                 </div>
             </div>
 
             <div class="logos">
                 <a href="http://nginx.net/"><img
-                    src="/nginx-logo.png"
+                    src="nginx-logo.png" 
                     alt="[ Powered by nginx ]"
                     width="121" height="32" /></a>
-
-                <a href="http://fedoraproject.org/"><img 
-                    src="/poweredby.png"
-                    alt="[ Powered by Fedora ]" 
+                <a href="http://www.redhat.com/"><img
+                    src="poweredby.png"
+                    alt="[ Powered by Red Hat Enterprise Linux ]"
                     width="88" height="31" /></a>
             </div>
         </div>
diff --git a/nginx.spec b/nginx.spec
index e53937a..0ae29de 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -41,7 +41,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.20.1
-Release:           7%{?dist}
+Release:           8%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 # BSD License (two clause)
@@ -584,6 +584,9 @@ fi
 
 
 %changelog
+* Wed Sep 22 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-8
+- Resolves: #2007019 - use proper wording in error pages
+
 * Wed Sep 22 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-7
 - Resolves: #2006420 - Broken loading certificates from hardware token (PKCS#11)