Skip to content
This repository was archived by the owner on Mar 22, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/examples/contacts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion assets/examples/contacts/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Amber.js Contacts</title>
<title>Ember.js Contacts</title>
<link rel="stylesheet" href="style.css" type="text/css" media="screen" charset="utf-8">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.js"></script>
<script type="text/javascript" src="../lib/ember.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion assets/tutorial/steps/13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions assets/tutorial/tutorial.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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!"
});
};
*/
2 changes: 1 addition & 1 deletion team.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down