From 9bffe7a714a5a3be666dd4d66b6618df9739f616 Mon Sep 17 00:00:00 2001
From: jackie_wu <wutao61@huawei.com>
Date: Fri, 22 May 2020 10:11:11 +0800
Subject: [PATCH 1/2] change and delete html

---
 404.html        |   2 +-
 50x.html        |   2 +-
 index.html      |  11 +---
 nginx-upgrade.8 | 151 ------------------------------------------------
 nginx.spec      |   8 +--
 5 files changed, 9 insertions(+), 165 deletions(-)
 delete mode 100644 nginx-upgrade.8
diff --git a/404.html b/404.html
index 77a3cb8..4c28a42 100644
--- a/404.html
+++ b/404.html
@@ -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
+                    openEuler.  It is located
                     <tt>/usr/share/nginx/html/404.html</tt></p>
 
                     <p>You should customize this error page for your own
diff --git a/50x.html b/50x.html
index 38c166a..ff40fd9 100644
--- a/50x.html
+++ b/50x.html
@@ -92,7 +92,7 @@
                     <p>Something has triggered an error on your
                     website.  This is the default error page for
                     <strong>nginx</strong> that is distributed with
-                    Fedora.  It is located
+                    openEuler.  It is located
                     <tt>/usr/share/nginx/html/50x.html</tt></p>
 
                     <p>You should customize this error page for your own
diff --git a/index.html b/index.html
index dea2265..ed942a6 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
-        <title>Test Page for the Nginx HTTP Server on Fedora</title>
+        <title>Test Page for the Nginx HTTP Server on openEuler</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <style type="text/css">
             /*<![CDATA[*/
@@ -74,7 +74,7 @@
     </head>
 
     <body>
-        <h1>Welcome to <strong>nginx</strong> on Fedora!</h1>
+        <h1>Welcome to <strong>nginx</strong> on openEuler!</h1>
 
         <div class="content">
             <p>This page is used to test the proper operation of the
@@ -88,7 +88,7 @@
                 <div class="content">
                     <p>This is the default <tt>index.html</tt> page that
                     is distributed with <strong>nginx</strong> on
-                    Fedora.  It is located in
+                    openEuler.  It is located in
                     <tt>/usr/share/nginx/html</tt>.</p>
 
                     <p>You should now put your content in a location of
@@ -105,11 +105,6 @@
                     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 ]" 
-                    width="88" height="31" /></a>
             </div>
         </div>
     </body>
diff --git a/nginx-upgrade.8 b/nginx-upgrade.8
deleted file mode 100644
index 2a435ab..0000000
--- a/nginx-upgrade.8
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "NGINX-UPGRADE 8"
-.TH NGINX-UPGRADE 8 "2012-10-28" " " " "
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-nginx\-upgrade \- tool to upgrade nginx without any downtime
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fInginx-upgrade\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-This downstream shell script updates nginx without any downtime. After
-upgrading nginx via the package manager, running this script will create
-a new nginx master. This master takes over all new requests. The old
-masters and workers are then gracefully shutdown without breaking any
-existing connections.
-.PP
-For further information, see: <http://nginx.org/en/docs/control.html>
-.SH "BUGS"
-.IX Header "BUGS"
-If you find any bugs, please send an email to the author.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Jamie Nguyen <jamielinux@fedoraproject.org>
diff --git a/nginx.spec b/nginx.spec
index bdde530..150c42b 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -14,7 +14,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.16.1
-Release:           3
+Release:           4
 Summary:           A HTTP server, reverse proxy and mail proxy server
 License:           BSD
 URL:               http://nginx.org/
@@ -24,7 +24,6 @@ Source10:          nginx.service
 Source11:          nginx.logrotate
 Source12:          nginx.conf
 Source13:          nginx-upgrade
-Source14:          nginx-upgrade.8
 Source100:         index.html
 Source102:         nginx-logo.png
 Source103:         404.html
@@ -203,7 +202,6 @@ rm -f .%{_sysconfdir}/nginx/mime.types
 
 install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 .%{_mandir}/man8/nginx.8
 install -p -D -m 0755 %{SOURCE13} .%{_bindir}/nginx-upgrade
-install -p -D -m 0644 %{SOURCE14} .%{_mandir}/man8/nginx-upgrade.8
 popd
 
 for i in ftdetect indent syntax; do
@@ -344,9 +342,11 @@ fi
 %doc CHANGES README README.dynamic
 %{_mandir}/man3/nginx.3pm*
 %{_mandir}/man8/nginx.8*
-%{_mandir}/man8/nginx-upgrade.8*
 
 %changelog
+* Fri May 22 2020 wutao <wutao61@huawei.com> - 1:1.16.1-4
+- change and delete html
+
 * Mon May 11 2020 wutao <wutao61@huawei.com> - 1:1.16.1-3
 - modify patch and html
 
-- 
Gitee


From dc4874e9fab1157cd0d6e7e6a597001e37341f5a Mon Sep 17 00:00:00 2001
From: jackie_wu <wutao61@huawei.com>
Date: Fri, 22 May 2020 14:52:29 +0800
Subject: [PATCH 2/2] modify index.html

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index ed942a6..bacdfb5 100644
--- a/index.html
+++ b/index.html
@@ -2,8 +2,8 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
-        <title>Test Page for the Nginx HTTP Server on openEuler</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>Test Page for the Nginx HTTP Server on openEuler</title>
         <style type="text/css">
             /*<![CDATA[*/
             body {
-- 
Gitee

