Skip to content

Commit fc7cb0a

Browse files
committed
Merge branch 'master' of github.com:javascript-tutorial/en.javascript.info into sync-a0bfa924
2 parents bf46b31 + a0bfa92 commit fc7cb0a

File tree

204 files changed

+1767
-1328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1767
-1328
lines changed

Diff for: 1-js/01-getting-started/1-intro/article.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Scripts are provided and executed as plain text. They don't need special prepara
1212

1313
In this aspect, JavaScript is very different from another language called [Java](https://en.wikipedia.org/wiki/Java_(programming_language)).
1414

15-
```smart header="Why <u>Java</u>Script?"
15+
```smart header="Why is it called <u>Java</u>Script?"
1616
When JavaScript was created, it initially had another name: "LiveScript". But Java was very popular at that time, so it was decided that positioning a new language as a "younger brother" of Java would help.
1717
1818
But as it evolved, JavaScript became a fully independent language with its own specification called [ECMAScript](http://en.wikipedia.org/wiki/ECMAScript), and now it has no relation to Java at all.
Loading
Loading

0 commit comments

Comments
 (0)