Merge pull request emberjs#3 from plusgut/master

Made Renamings from Amber.js to Ember.js
hyksos · Dec 16, 2011 · ca6dff8 · ca6dff8
2 parents f1f1a4b + ddb9938
commit ca6dff8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/assets/examples/contacts/app.js b/assets/examples/contacts/app.js
@@ -74,7 +74,7 @@ App.contactsController = SC.ArrayController.create({
       success: function(data) {
         var contacts = data.contacts;
 
-        // Turn JSON objects into bindable Amber
+        // Turn JSON objects into bindable Ember
         // objects.
         contacts = contacts.map(function(item) {
           return self.createContactFromJSON(item);

diff --git a/assets/tutorial/steps/13.yml b/assets/tutorial/steps/13.yml
@@ -5,7 +5,7 @@ body: >
 
   <p>For this we can use the <code>bindAttr</code> helper which will automatically update an elements attributes based
   on the value of a binding. Here, we bind the class attribute. If <code>isDone</code> is true then the class will be
-  added. Amber automatically dasherizes class names for us.</p>
+  added. Ember automatically dasherizes class names for us.</p>
 
 codeTarget: 'template'
 

diff --git a/assets/tutorial/tutorial.js b/assets/tutorial/tutorial.js
@@ -469,7 +469,7 @@ Tutorial.AceEditorView = SC.AceEditorView.extend({
 /*
 Tutorial.loadSteps = function() {
   Tutorial.tutorialController.addStep({
-    body: "<strong>Welcome.</strong> To get a feel for Amber, follow along this quick tutorial."
+    body: "<strong>Welcome.</strong> To get a feel for Ember, follow along this quick tutorial."
   });
 
   Tutorial.tutorialController.addStep({
@@ -576,7 +576,7 @@ Tutorial.loadSteps = function() {
   });
 
   Tutorial.tutorialController.addStep({
-    body: "<strong>Congratulations!</strong> You've just created your first Amber application!"
+    body: "<strong>Congratulations!</strong> You've just created your first Ember application!"
   });
 };
 */
diff --git a/team.html b/team.html
@@ -43,7 +43,7 @@
       <!-- Main hero unit for a primary marketing message or call to action -->
       <div class="hero-unit">
         <h1>The Team</h1>
-        <p>This is the team of the awesome people working on Amber.js.</p>
+        <p>This is the team of the awesome people working on Ember.js.</p>
       </div>
 
       <!-- Example row of columns -->