diff --git a/www/approveuser.php3 b/www/approveuser.php3 index f34963176fe4f0617e59431e7c5d98d1d87f3389..31768303119e0ca602f3439825403c80e0aa7fe5 100644 --- a/www/approveuser.php3 +++ b/www/approveuser.php3 @@ -253,7 +253,7 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) { echo "

User $user was denied membership in project $project.
- The account has also be terminated with prejudice! + The account has also been terminated with prejudice!

\n"; continue; diff --git a/www/approveuser_form.php3 b/www/approveuser_form.php3 index c1e3835aa0797535693e7f98f778314bddbb23e7..c0d4654f2fc819de85216f03b102d1bf4863240c 100755 --- a/www/approveuser_form.php3 +++ b/www/approveuser_form.php3 @@ -35,13 +35,14 @@ echo "   Deny - - Deny user application + Deny user application and so notify the user.   Nuke - - Nuke user application. Kills user account. Useful for + Nuke user application. Kills user account, without + notice to user. Useful for bogus project applications. @@ -69,7 +70,7 @@ echo " Root - User may create/destroy experiments in your project and - has root privledges on machines in your experiments + has root privileges on machines in your experiments \n"; diff --git a/www/menu.php3 b/www/menu.php3 index 82dff7f76249b4f356e6b5bb79e8396629e0e9df..3c4acb155dd4c9d736dc14c98f51a38b11a4944c 100644 --- a/www/menu.php3 +++ b/www/menu.php3 @@ -117,7 +117,7 @@ function WRITESIDEBAR() { $TBBASE, "approveproject_list.php3"); } if ($trusted) { - # Only group leaders can do these options + # Only project leaders can do these options WRITESIDEBARBUTTON("New User Approval", $TBBASE, "approveuser_form.php3"); } diff --git a/www/policies.html b/www/policies.html index 92a916469d1274567bf692f1e4a07b6bca3056e3..7093cbbf38aa62fe1e17e876eee6ae1678644151 100644 --- a/www/policies.html +++ b/www/policies.html @@ -1,6 +1,6 @@ - Emulab.Net - Administrative Policies + emulab.net - Administrative Policies @@ -86,10 +86,11 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

We disclaim all liability from errors in results or security breaches -resulting from the testbed's use. The system is currently not even at -"alpha" level and will be undergoing rapid development for some time. -We are making some effort to provide inter-project security, but users -must realize that security is unlikely in i) such a new and rapidly +resulting from emulab's use. The system is currently at +"beta" level but is constantly undergoing rapid development, so +significant amounts of code are always new. +We are making an effort to provide inter-project security, but users +must realize that high security is unlikely in i) such a new and rapidly evolving system, ii) where users have such complete control over hardware and software resources, and iii) in such a public facility that will attract attack. diff --git a/www/projectlist.php3 b/www/projectlist.php3 index 957e18f37b7dc5af17853bf178e29c451c7016e5..73c978846ec83236173818840096e82b6a17be0a 100644 --- a/www/projectlist.php3 +++ b/www/projectlist.php3 @@ -4,10 +4,12 @@ include("defs.php3"); # # Standard Testbed Header # -PAGEHEADER("Clients who have actively used Emulab.net"); +# Change when do check for number of experiments. +# PAGEHEADER("Projects that have actively used emulab.net"); +PAGEHEADER("Projects that have used emulab.net"); # -# We let anyone access this page. Its bascailly a pretty printed version of the +# We let anyone access this page. It's basically a pretty-printed version of the # current testbed clients, who have not opted out from this display. # # Complete information is better viewed with the "Project Information" link. @@ -32,10 +34,6 @@ if (mysql_num_rows($query_result) == 0) { USERERROR("There are no projects!", 1); } -echo "

- Here is a list of research groups actively using Emulab.Net -

\n"; - echo "\n"; diff --git a/www/verifyusr.php3 b/www/verifyusr.php3 index d52cd9f99c251482ff18522450b13fb11ce63ebb..ddd2cf9db226c8399f1317967325833f990b6393 100644 --- a/www/verifyusr.php3 +++ b/www/verifyusr.php3 @@ -51,9 +51,9 @@ if (strcmp($status, "unverified") == 0) { TBERROR("Database Error setting status for $uid: $err\n", 1); } - echo "

Because your group leader has already approved ". - "your membership in the group, you are now an active user ". - "of the Testbed. Reload the frame at your left, and any options ". + echo "

Because your project leader has already approved ". + "your membership in the project, you are now an active user ". + "of emulab. Reload the frame at your left, and any options ". "that are now available to you will appear.

\n"; } elseif (strcmp($status, "newuser") == 0) { @@ -65,7 +65,7 @@ elseif (strcmp($status, "newuser") == 0) { } echo "

You have now been verified. However, your application ". - "has not yet been approved by the group leader. You will receive ". + "has not yet been approved by the project leader. You will receive ". "email when that has been done.

\n"; } else { diff --git a/www/verifyusr_form.php3 b/www/verifyusr_form.php3 index 35b2cf99600c69b23cc5444fec0cc513a80a7138..9decf46b9bbffd77e183b60423fa0fdf6c4a84cf 100644 --- a/www/verifyusr_form.php3 +++ b/www/verifyusr_form.php3 @@ -14,7 +14,7 @@ LOGGEDINORDIE($uid); echo "

The purpose of this page is to verify, for security purposes, that - information given in your application is correct. If you never + information given in your application is authentic. If you never received a key at the email address given on your application, please contact $TBMAILADDR for further assistance.

\n";