diff --git a/browserid/lib/prove_template.txt b/browserid/lib/prove_template.txt
index 3bc70f5932def67aa8e7828ae50fea2af28e49ed..000d8f62377d81f18f026a4cc36d86a8d071a3c8 100644
--- a/browserid/lib/prove_template.txt
+++ b/browserid/lib/prove_template.txt
@@ -1,6 +1,6 @@
Hi {{email}},
-This message is being sent to you to complete your login to
+This message is being sent to you to complete your sign-in to
{{site}}. Click the link below to continue:
{{link}}
@@ -9,4 +9,4 @@ If you are NOT trying to sign into {{site}}, just ignore this email.
Thanks,
BrowserID
-(A better way to login)
+(A better way to sign in)
diff --git a/browserid/static/dialog/resources/main.js b/browserid/static/dialog/resources/main.js
index 845c4d9c9a14a6cc9108f6a229b63adc132232d6..9cfdaaf3f5a64c69a2a84d5722ed48e42a0a2f24 100644
--- a/browserid/static/dialog/resources/main.js
+++ b/browserid/static/dialog/resources/main.js
@@ -39,7 +39,7 @@ var run = function() {
runErrorDialog(
"serverError",
"Error Communicating With Server!",
- "There was a technical problem while trying to log you in. Yucky!",
+ "There was a technical problem while trying to sign you in. Yucky!",
onsuccess, onerror);
}
});
@@ -100,7 +100,6 @@ var run = function() {
if (resp.unknown_emails) {
for (var i = 0; i < resp.unknown_emails; i++) {
if (emails.hasOwnProperty(resp.unknown_emails[i])) {
- console.log("removed local identity: " + resp.unknown_emails[i]);
delete emails[resp.unknown_emails[i]];
}
}
@@ -142,7 +141,7 @@ var run = function() {
addNextEmail();
},
error: function(jqXHR, textStatus, errorThrown) {
- runErrorDialog("serverError", "Login Failed", jqXHR.responseText, onsuccess, onerror);
+ runErrorDialog("serverError", "Signin Failed", jqXHR.responseText, onsuccess, onerror);
}
});
@@ -235,7 +234,7 @@ var run = function() {
} else {
runWaitingDialog(
"Finishing Log In...",
- "In just a moment you'll be logged into BrowserID.",
+ "In just a moment you'll be signed into BrowserID.",
onsuccess, onerror);
syncIdentities(onsuccess, onerror);
@@ -245,7 +244,7 @@ var run = function() {
runErrorDialog(
"serverError",
"Error Authenticating!",
- "There was a technical problem while trying to log you in. Yucky!",
+ "There was a technical problem while trying to sign you in. Yucky!",
onsuccess, onerror);
}
});
diff --git a/browserid/static/dialog/views/authenticate.ejs b/browserid/static/dialog/views/authenticate.ejs
index 7fe1a8cbd4c19e75e29898769c2bcc17d7958c95..728e4c0408027a07f5bee324b6a7a7bb6bb3b479 100644
--- a/browserid/static/dialog/views/authenticate.ejs
+++ b/browserid/static/dialog/views/authenticate.ejs
@@ -1,5 +1,5 @@
<div class="content">
- <p class="prompt">Logging into <span class="sitename bad"><%= sitename %></span>:</p>
+ <p class="prompt">Signing into <span class="sitename bad"><%= sitename %></span>:</p>
<div class="input">
<div class="label"> Email </div>
<div class="input"> <input type="text" id="email_input"></input></div>
diff --git a/browserid/static/dialog/views/body.ejs b/browserid/static/dialog/views/body.ejs
index 777d170e4aeab5549ddfc30e634ca994c8ca8d9a..ce608ece484a306ee3ce0a33a0cd4a451e4f7f22 100644
--- a/browserid/static/dialog/views/body.ejs
+++ b/browserid/static/dialog/views/body.ejs
@@ -1,5 +1,5 @@
<div id="header">
- <div class="title"><img src="/i/browserid_logo_lil.png"></div><div class="subtitle">A better way to log in.</div>
+ <div class="title"><img src="/i/browserid_logo_lil.png"></div><div class="subtitle">A better way to sign in.</div>
</div>
<div id="dialog" class="dialog">
diff --git a/browserid/static/dialog/views/create.ejs b/browserid/static/dialog/views/create.ejs
index 8d7785a24fcaeb5d77b840f2e690852acf92bbf8..ede579872d8766dbac750a891a2c88011fd5f7c9 100644
--- a/browserid/static/dialog/views/create.ejs
+++ b/browserid/static/dialog/views/create.ejs
@@ -1,5 +1,5 @@
<div class="content">
- <div class="summary">BrowserID makes logging in <b>safer and easier</b>. To begin, please provide an email address and pick a password:</div>
+ <div class="summary">BrowserID makes signing in <b>safer and easier</b>. To begin, please provide an email address and pick a password:</div>
<div class="input">
<div class="label"> Email </div>
<div class="input"> <input id="email_input" type="text"></input></div>
diff --git a/browserid/static/dialog/views/signin.ejs b/browserid/static/dialog/views/signin.ejs
index b39509914b7fbfd38598ad39fcba18a159de331f..f0802e68da9b72754f49425298400f6fc7a853d7 100644
--- a/browserid/static/dialog/views/signin.ejs
+++ b/browserid/static/dialog/views/signin.ejs
@@ -1,5 +1,5 @@
<div class="content">
- <p class="prompt">What email address would you like to use to log into <span class="sitename bad"><%= sitename %></span>?</p>
+ <p class="prompt">What email address would you like to use to sign into <span class="sitename bad"><%= sitename %></span>?</p>
<form id="identities" name="identities">
<% _.each(identities, function(email_obj, email_address) { %>
<div><input type="radio" name="identity" value="<%=email_address%>" /> <%= email_address %></div>
diff --git a/browserid/tests/forgotten-email-test.js b/browserid/tests/forgotten-email-test.js
index b5aa012389e5697737053aef689d884af48975df..ecd259c8eabba3d83d9aa67187b1e77c244960ce 100755
--- a/browserid/tests/forgotten-email-test.js
+++ b/browserid/tests/forgotten-email-test.js
@@ -144,7 +144,7 @@ suite.addBatch({
}
});
-// now we should be able to log into the first email address with the second
+// now we should be able to sign into the first email address with the second
// password, and all other combinations should fail
suite.addBatch({
"first email, first pass bad": {
diff --git a/browserid/views/developers.ejs b/browserid/views/developers.ejs
index 91c7df8d7c98bdab5f4df4203b1f8d4e2618faee..85a67d0110f3645aa19503e1146c296f4a590956 100644
--- a/browserid/views/developers.ejs
+++ b/browserid/views/developers.ejs
@@ -3,7 +3,7 @@
<div class="why">
<p>
BrowserID provides a <b>simple</b> and <b>sophisticated</b>
- login process that your <b>users will love</b>. It can be
+ sign-in process that your <b>users will love</b>. It can be
integrated in three easy steps:
</p>
</div>
@@ -18,7 +18,7 @@
<p>
<b>Identify the User:</b> Instead of displaying a form on your
site which takes a username and password, use the BrowserID
- JavaScript API when the user clicks your login button:
+ JavaScript API when the user clicks your sign-in button:
</p>
<pre><code class="javascript">navigator.id.getVerifiedEmail(function(assertion) {
if (assertion) {
@@ -30,13 +30,13 @@
});
</code></pre>
<p>
- Upon a successful login, you'll be called back with
+ Upon a successful sign-in, you'll be called back with
an <i>assertion</i>, a string containing a signed claim that proves
the user is who they say they are.
</p>
<p>
<b>NOTE:</b> While completely optional, you might consider
- replacing your login/signin button with a pretty BrowserID button:
+ replacing your sign-in button with a pretty BrowserID button:
<div class="buttonbox">
<div><img src="i/sign_in_red.png"></div>
diff --git a/browserid/views/index.ejs b/browserid/views/index.ejs
index 6d89bc145fdb815e1ef4f1757b9f9b2299ab9f59..02ed5cc2d20c061fd08780bea4cf35057751d3a2 100644
--- a/browserid/views/index.ejs
+++ b/browserid/views/index.ejs
@@ -1,10 +1,10 @@
<div class="why">
<img style="float: right;" src="i/people.png">
- <p>For <b>users</b>, BrowserID provides a <b>safer and easier</b> way to log in. <a href="/users">How it works.</a></p>
+ <p>For <b>users</b>, BrowserID provides a <b>safer and easier</b> way to sign in. <a href="/users">How it works.</a></p>
</div>
<div class="why">
<img style="float: left;" src="i/developers.png">
- <p>For <b>developers</b>, BrowserID offers a world class login experience with only a couple lines of code. <a href="developers">Get Started.</a></p>
+ <p>For <b>developers</b>, BrowserID offers a world class sign-in experience with only a couple lines of code. <a href="developers">Get Started.</a></p>
</div>
<div class="why">
<img style="float: right;" src="i/id.png">
diff --git a/browserid/views/layout.ejs b/browserid/views/layout.ejs
index b18d6d88fb86ed800b6eccdb8a5dde7936b3e066..f05f31e9607332c67841a3f66601c59286737489 100644
--- a/browserid/views/layout.ejs
+++ b/browserid/views/layout.ejs
@@ -67,7 +67,7 @@ function display_saved_ids()
});
var d = new Date(data.created);
- var datestamp = $("<div class='date'>").text("Logged in at " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds() + ", " + d.getMonth() + "/" + d.getDay() + "/" + d.getUTCFullYear());
+ var datestamp = $("<div class='date'>").text("Signed in at " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds() + ", " + d.getMonth() + "/" + d.getDay() + "/" + d.getUTCFullYear());
meta.append(datestamp);
meta.append(linkblock);
@@ -85,12 +85,12 @@ function display_saved_ids()
<body>
<div id="splash">
<div class="header">
- <div class="manage"><a id="manageLink" href="manage">manage my logins</a></div>
+ <div class="manage"><a id="manageLink" href="manage">my account</a></div>
</div>
<% if (fullpage) { %>
<div class="tophalf">
<div class="title"><img src="i/browserid_logo.png"></div>
- <div class="subtitle">A better way to log in.</div>
+ <div class="subtitle">A better way to sign in.</div>
</div>
<% } else { %>
<div class="topquarter">
diff --git a/browserid/views/users.ejs b/browserid/views/users.ejs
index 93e2c8e91842906afbe4cd032a7b72b340f36286..284e724d29c988652ab6d5a8ffb64021e846fb0f 100644
--- a/browserid/views/users.ejs
+++ b/browserid/views/users.ejs
@@ -1,6 +1,6 @@
<div class="why" style="height:500px;">
<p>
- As a user of BrowserID, you confirm your email addresses once. Then, you can log into any web site that supports BrowserID with just two clicks.
+ As a user of BrowserID, you confirm your email addresses once. Then, you can sign into any web site that supports BrowserID with just two clicks.
</p>
<iframe width="480" height="390" src="http://www.youtube.com/embed/l0t9yDLAmFo" frameborder="0" allowfullscreen></iframe>
diff --git a/rp/index.html b/rp/index.html
index 167669a35868e549e25545edcda5f1557bec8371..be382ce9a307e87e06f06c24d9ad8f059c01fd34 100644
--- a/rp/index.html
+++ b/rp/index.html
@@ -74,7 +74,7 @@ a:hover { border-bottom: 2px solid black ; }
<div class="step">
<div class="number">6.</div>
- <div class="desc"><b>All Done!</b> The site can now create an account keyed on the users identity (email address), set cookies, etc! Logging in again is just re-running these same steps.</div>
+ <div class="desc"><b>All Done!</b> The site can now create an account keyed on the users identity (email address), set cookies, etc! Signing in again is just re-running these same steps.</div>
</div>
</body>
diff --git a/rp/index2.html b/rp/index2.html
index 62b496e54ae92823445aefaad817c8ccb32b19d8..cdc25d3781af1b7fc01affcba7c6b7276833ed2c 100644
--- a/rp/index2.html
+++ b/rp/index2.html
@@ -76,7 +76,7 @@ a:hover { border-bottom: 2px solid black ; }
<div class="step">
<div class="number">6.</div>
- <div class="desc"><b>All Done!</b> The site can now create an account keyed on the users identity (email address), set cookies, etc! Logging in again is just re-running these same steps.</div>
+ <div class="desc"><b>All Done!</b> The site can now create an account keyed on the users identity (email address), set cookies, etc! Signing in again is just re-running these same steps.</div>
</div>
</body>