[nginx] svn commit: r4860 - in branches/stable-1.2: . docs/html

Mon Sep 24 19:14:17 UTC 2012

Author: mdounin
Date: 2012-09-24 19:14:17 +0000 (Mon, 24 Sep 2012)
New Revision: 4860
URL: http://trac.nginx.org/nginx/changeset/4860/nginx

Log:
Merge of r4835, r4841: improved welcome and 50x error pages.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/docs/html/50x.html
   branches/stable-1.2/docs/html/index.html

Index: branches/stable-1.2
===================================================================

--- branches/stable-1.2	2012-09-24 19:11:45 UTC (rev 4859)
+++ branches/stable-1.2	2012-09-24 19:14:17 UTC (rev 4860)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4834,4840,4842-4844
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844
\ No newline at end of property
Modified: branches/stable-1.2/docs/html/50x.html
===================================================================
--- branches/stable-1.2/docs/html/50x.html	2012-09-24 19:11:45 UTC (rev 4859)
+++ branches/stable-1.2/docs/html/50x.html	2012-09-24 19:14:17 UTC (rev 4860)
@@ -1,18 +1,21 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>The page is temporarily unavailable</title>
+<title>Error</title>
 <style>
-body { font-family: Tahoma, Verdana, Arial, sans-serif; }
+    body {
+        width: 35em;
+        margin: 0 auto;
+        font-family: Tahoma, Verdana, Arial, sans-serif;
+    }
 </style>
 </head>
-<body bgcolor="white" text="black">
-<table width="100%" height="100%">
-<tr>
-<td align="center" valign="middle">
-The page you are looking for is temporarily unavailable.<br/>
-Please try again later.
-</td>
-</tr>
-</table>
+<body>
+<h1>An error occurred.</h1>
+<p>Sorry, the page you are looking for is currently unavailable.<br/>
+Please try again later.</p>
+<p>If you are the system administrator of this resource then you should check
+the <a href="http://nginx.org/r/error_log">error log</a> for details.</p>
+<p><em>Faithfully yours, nginx.</em></p>
 </body>
 </html>

Modified: branches/stable-1.2/docs/html/index.html
===================================================================
--- branches/stable-1.2/docs/html/index.html	2012-09-24 19:11:45 UTC (rev 4859)
+++ branches/stable-1.2/docs/html/index.html	2012-09-24 19:14:17 UTC (rev 4860)
@@ -1,8 +1,25 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Welcome to nginx!</title>
+<style>
+    body {
+        width: 35em;
+        margin: 0 auto;
+        font-family: Tahoma, Verdana, Arial, sans-serif;
+    }
+</style>
 </head>
-<body bgcolor="white" text="black">
-<center><h1>Welcome to nginx!</h1></center>
+<body>
+<h1>Welcome to nginx!</h1>
+<p>If you see this page, the nginx web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="http://nginx.org/">nginx.org</a>.<br/>
+Commercial support is available at
+<a href="http://nginx.com/">nginx.com</a>.</p>
+
+<p><em>Thank you for using nginx.</em></p>
 </body>
 </html>

