From f7655576cd24686585118a33d100378e483834f7 Mon Sep 17 00:00:00 2001 From: "Mark L. Chang" Date: Fri, 10 May 2013 13:21:09 -0400 Subject: [PATCH 1/4] copy change --- cms/templates/500.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cms/templates/500.html b/cms/templates/500.html index 2645b0067b..6e381c0844 100644 --- a/cms/templates/500.html +++ b/cms/templates/500.html @@ -1,12 +1,17 @@ <%inherit file="base.html" /> -<%block name="title">Server Error + +<%block name="title">Studio Server Error <%block name="content">
-

Currently the edX servers are down

-

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@edx.org to report any problems or downtime.

+

The Studio servers encountered an error

+

+ An error occurred in Studio and the page could not be loaded. Please try again in a few moments. + We've logged the error and our staff is currently working to get Studio back up as soon as possible. + If the problem persists, please email us at technical@edx.org. +

From 4003f8633d7f105f8975329c7cdc0ecd8e56d864 Mon Sep 17 00:00:00 2001 From: "Mark L. Chang" Date: Fri, 10 May 2013 13:39:46 -0400 Subject: [PATCH 2/4] more copy tweaks --- cms/templates/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/500.html b/cms/templates/500.html index 6e381c0844..3d18d9dcc5 100644 --- a/cms/templates/500.html +++ b/cms/templates/500.html @@ -9,7 +9,7 @@

The Studio servers encountered an error

An error occurred in Studio and the page could not be loaded. Please try again in a few moments. - We've logged the error and our staff is currently working to get Studio back up as soon as possible. + We've logged the error and our staff is currently working to resolve this error as soon as possible. If the problem persists, please email us at technical@edx.org.

From 317831a8132e432723898324cd119e61fe4a01d0 Mon Sep 17 00:00:00 2001 From: "Mark L. Chang" Date: Fri, 10 May 2013 13:21:09 -0400 Subject: [PATCH 3/4] copy change --- cms/templates/500.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cms/templates/500.html b/cms/templates/500.html index 2645b0067b..6e381c0844 100644 --- a/cms/templates/500.html +++ b/cms/templates/500.html @@ -1,12 +1,17 @@ <%inherit file="base.html" /> -<%block name="title">Server Error + +<%block name="title">Studio Server Error <%block name="content">
-

Currently the edX servers are down

-

Our staff is currently working to get the site back up as soon as possible. Please email us at technical@edx.org to report any problems or downtime.

+

The Studio servers encountered an error

+

+ An error occurred in Studio and the page could not be loaded. Please try again in a few moments. + We've logged the error and our staff is currently working to get Studio back up as soon as possible. + If the problem persists, please email us at technical@edx.org. +

From f864a6c00c79e20a19bbb563c7c900e2343b2a16 Mon Sep 17 00:00:00 2001 From: "Mark L. Chang" Date: Fri, 10 May 2013 13:39:46 -0400 Subject: [PATCH 4/4] more copy tweaks --- cms/templates/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/500.html b/cms/templates/500.html index 6e381c0844..3d18d9dcc5 100644 --- a/cms/templates/500.html +++ b/cms/templates/500.html @@ -9,7 +9,7 @@

The Studio servers encountered an error

An error occurred in Studio and the page could not be loaded. Please try again in a few moments. - We've logged the error and our staff is currently working to get Studio back up as soon as possible. + We've logged the error and our staff is currently working to resolve this error as soon as possible. If the problem persists, please email us at technical@edx.org.