X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2FemailTxt.py;h=9a7fec3ce58feaab0a04a72e97aae323bd24b072;hb=3f4df5945bbfb4592a164d929cf22c31d5fba50e;hp=e582077da899704894e65de47c3e4691b693a25d;hpb=7028fdb5e122089f2e1fb1c6a9178ab8f8aa5fe1;p=monitor.git

diff --git a/monitor/wrapper/emailTxt.py b/monitor/wrapper/emailTxt.py
index e582077..9a7fec3 100644
--- a/monitor/wrapper/emailTxt.py
+++ b/monitor/wrapper/emailTxt.py
@@ -235,7 +235,7 @@ Thank you very much for your help,
 the host did not come back online.  You may be able to learn more by visiting
 this link:
 
-	https://monitor.planet-lab.org/monitor/pcuview?pcu_id=%(pcu_id)s
+	https://monitor.planet-lab.org/monitor/pcuview?loginbase=%(loginbase)s
 
 We need your help resolving this issue in a few ways:  
 
@@ -309,12 +309,12 @@ Thank you very much for your help,
   -- PlanetLab Central (support@planet-lab.org)
 	""")
 
-	clear_penalty=("""MONTEST: All penalties cleared from site %(loginbase)s""",
+	clear_penalty=("""MONTEST: All privileges restored to site %(loginbase)s""",
 	"""
-This notice is to let you know that any penalties previously applied to your 
-site have been removed: %(penalty_level)s.
+This notice is to let you know that any privileges previously reduced at your 
+site have been restored: %(penalty_level)s.
 
-All privileges have been restored.  You may create slices again, and if your 
+All privileges are restored.  You may create slices again, and if your 
 slices were disabled, please allow up to 30 minutes for them to return to 
 enabled.
 
@@ -330,10 +330,10 @@ Legend:
   2+ - all existing slices will be disabled.
 	""")
 
-	increase_penalty=("""MONTEST: Penalty increased for site %(loginbase)s""",
+	increase_penalty=("""MONTEST: Privilege reduced for site %(loginbase)s""",
 	"""
-This notice is to let you know that the penalty applied to your site has
-increased: %(penalty_level)s.
+This notice is to let you know that the privileges granted to your site as
+a participating member of Planetlab have reduced: %(penalty_level)s.
 
 Your privileges will be reduced corresponding to the legend below.  To 
 restore these privileges, please return at least two machines to working 
@@ -480,7 +480,6 @@ Thank you for your help,
 	#newalphacd=[newalphacd_one, newalphacd_one, newalphacd_one]
 	newthankyou=[thankyou,thankyou,thankyou]
 	pcuthankyou=[pcuthankyou_one,pcuthankyou_one,pcuthankyou_one]
-	NMReset=[nmreset,nmreset,nmreset]
 	pcutonodemapping=[pcutonodemapping_one, pcutonodemapping_one, pcutonodemapping_one]
 	pcudown=[pcudown_one, pcudown_one, pcudown_one]