Skip to content

Commit ecabac8

Browse files
authored
Merge pull request #1 from ember-learn/master
bringing changes from base repo
2 parents 9549fa6 + 4fb09d7 commit ecabac8

29 files changed

+5591
-1830
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
8+
[*]
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.md]
17+
trim_trailing_whitespace = false

.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
language: node_js
3+
node_js:
4+
- 6
5+
6+
sudo: false
7+
dist: trusty
8+
9+
cache:
10+
directories:
11+
- $HOME/.npm
12+
13+
before_install:
14+
- npm config set spin false
15+
16+
script:
17+
- npm run lint:md
18+
- npm test

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ You will need the following things properly installed on your computer.
2525
To see what a local copy of the Guides markdown looks like:
2626

2727
* Clone the [Ember CLI Guides](https://github.com/ember-learn/cli-guides-app) App repository
28-
* link the `ember-cli-guides-source` repository by running `npm link` inside this repository, then `npm link @ember-learn/cli-guides` in the guides-app
28+
* link the `cli-guides-source` repository by running `npm link` inside this repository, then `npm link @ember-learn/cli-guides` in the guides-app
2929
* `npm install` and `ember serve` in the guides app
3030
* Visit your app at [http://localhost:4200](http://localhost:4200).
3131
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).

guides/advanced-use/asset-pipeline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- Cover very very basic Broccoli info. Link to Oli's tutorials. See the Ember Times Readers questions for a great writeup of what broccoli is -->
1+
<!-- Cover very very basic Broccoli info. Link to Oli's tutorials. See the Ember Times Readers questions for a great writeup of what broccoli is -->

guides/advanced-use/blueprints.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- cover what blueprints are and how to modify them. Can be ported from the existing site -->
1+
<!-- cover what blueprints are and how to modify them. Can be ported from the existing site -->

guides/advanced-use/configurations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- Should cover at least minification and fingerprinting -->
1+
<!-- Should cover at least minification and fingerprinting -->

guides/advanced-use/file-layout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- A place to talk about the resolver (see ember-cli.com), module imports, and eventually, Module Unification when it becomes a thing -->
1+
<!-- A place to talk about the resolver (see ember-cli.com), module imports, and eventually, Module Unification when it becomes a thing -->

guides/advanced-use/stylesheets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- Should cover similar topics as ember-cli.com -->
1+
<!-- Should cover similar topics as ember-cli.com -->

guides/api-documentation/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ The API docs for Ember CLI are mainly for addon authors, advanced Ember app deve
44

55
The docs are the main resource for information like build pipeline modifications, addon author APIs, advanced configurations, and more.
66

7-
The API documentation is built from the code comments in the main CLI codebase, [ember-cli on GitHub](https://github.com/ember-cli/ember-cli). If you spot an issue in the documentation, please open an issue or pull request on that repository.
7+
The API documentation is built from the code comments in the main CLI codebase, [ember-cli on GitHub](https://github.com/ember-cli/ember-cli). If you spot an issue in the documentation, please open an issue or pull request on that repository.

guides/basic-use/configurations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!-- The bare minimum explanation of what to do with ember-cli-build.js -->
1+
<!-- The bare minimum explanation of what to do with ember-cli-build.js -->

0 commit comments

Comments
 (0)