diff options
| author | Michael Prasuhn <mike@mikeyp.net> | 2010-04-16 01:30:01 -0700 |
|---|---|---|
| committer | Michael Prasuhn <mike@mikeyp.net> | 2010-04-16 01:30:01 -0700 |
| commit | 009b92e3425f9d0fa764e02a191bd139b4f8ae1c (patch) | |
| tree | 0e40ab12a8ecaeb31c38711aab0ddf4d3dcf0d3d | |
| parent | 7530d58f61101db91e03ba075a47299db1f96f35 (diff) | |
| parent | cd2bbd0e602244403ca379f9f4d9d15bbde545a7 (diff) | |
| download | etherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.tar.gz etherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.tar.xz etherpad-009b92e3425f9d0fa764e02a191bd139b4f8ae1c.zip | |
Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'
| -rw-r--r-- | etherpad/src/etherpad/legacy_urls.js | 2 | ||||
| -rw-r--r-- | etherpad/src/static/js/store.js | 2 | ||||
| -rw-r--r-- | infrastructure/com.etherpad/licensing.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/etherpad/src/etherpad/legacy_urls.js b/etherpad/src/etherpad/legacy_urls.js index 458f3b6..d8aa629 100644 --- a/etherpad/src/etherpad/legacy_urls.js +++ b/etherpad/src/etherpad/legacy_urls.js @@ -14,7 +14,7 @@ * limitations under the License. */ -/* legacy URLs only apply to the public etherpad.com site. (not Pro or PNE). */ +/* legacy URLs only apply to the public main site. (not Pro or PNE). */ var _legacyURLs = { '/ep/beta-signup': '/', diff --git a/etherpad/src/static/js/store.js b/etherpad/src/static/js/store.js index 96a6487..5750f42 100644 --- a/etherpad/src/static/js/store.js +++ b/etherpad/src/static/js/store.js @@ -74,7 +74,7 @@ store.eepnetTrial.submit = function() { $('#dlsignup').hide(); $('#processingmsg').fadeIn('fast'); - // first stubmit to etherpad.com... + // first submit... var data = {}; $(".signupData").each(function() { data[$(this).attr("id")] = $(this).val(); diff --git a/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala index 9318f78..68019f5 100644 --- a/infrastructure/com.etherpad/licensing.scala +++ b/infrastructure/com.etherpad/licensing.scala @@ -134,7 +134,7 @@ object Licensing { println("Done."); } case "genmainkey" => { - println("Generating key for etherpad.com..."); + println("Generating main key..."); config.values("licenseGeneratorKey") = args(1); val out = new PrintWriter(new FileOutputStream(args(2))); out.print(generateKey("etherpad", "AppJet", -1, 0, -1, 0, 0, 0)) |