Merge pull request #206 from ockley/master

Small text changes

Author: ockley

1-js/01-getting-started/1-intro/article.md

@@ -2,7 +2,7 @@
 
 Lad os se, hvad der er så specielt ved JavaScript, hvad vi kan opnå med det, og hvilke andre teknologier der spiller godt sammen med det.
 
-## What is JavaScript?
+## Hvad er JavaScript?
 
 *JavaScript* blev oprindeligt skabt for at "gøre websider levende".
 

1-js/01-getting-started/2-manuals-specifications/article.md

@@ -4,7 +4,7 @@ Denne bog er en *tutorial*. Den går efter at hjælpe dig med at lære dig sprog
 
 ## Specifikationer
 
-[ECMA-262 specificationen](https://www.ecma-international.org/publications/standards/Ecma-262.htm) indeholder den mest dybdegående, detaljerede og formaliserede information om JavaScript. Det er den der definerer selve sproget.
+[ECMA-262 specifikationen](https://www.ecma-international.org/publications/standards/Ecma-262.htm) indeholder den mest dybdegående, detaljerede og formaliserede information om JavaScript. Det er den der definerer selve sproget.
 
 Men, når det er skrevet så formelt er det også meget svært at forstå for en begynder. Så, hvis du skal bruge den mest pålidelige kilde til information om detaljer i sproget, så er specifikationen det rigtige sted. Men, det er ikek til hverdagsbrug.
 

1-js/01-getting-started/4-devtools/article.md

@@ -49,11 +49,7 @@ Udseendet og måden de virker på er ret ens. Så snart du kender til én af bro
 
 Safari (Mac browser, ikke understøttet af Windows/Linux) er lidt speciel her. Du er nød til først at aktivere "Udviklermenu" (Develop menu) først.
 
-<<<<<<< HEAD
-Åbn indstillingerne og gå til "Avanceret" (Advanced) pane. Her er der en checkbox nederst:
-=======
-Open Settings and go to the "Advanced" pane. There's a checkbox at the bottom:
->>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
+Åbn indstillingerne og gå til "Avanceret" (Advanced) tab. Her er der en checkbox nederst:
 
 ![safari](safari.png)
 

README.md

@@ -1,10 +1,8 @@
 # The Modern JavaScript Tutorial in Danish
 
-<<<<<<< HEAD
 This repository hosts the translation of <https://javascript.info> in Danish.
 =======
 This repository hosts the English content of the Modern JavaScript Tutorial, published at [https://javascript.info](https://javascript.info).
->>>>>>> ea7738bb7c3616bb51ff14ae3db2a2747d7888ff
 
 
 **That's how you can contribute:**
@@ -25,19 +23,17 @@ If maintainers do not respond, or if you'd like to become a maintainer, write us
 
 🎉 Thank you!
 
-<<<<<<< HEAD
 Your name and the contribution size will appear in the "About project" page when the translation gets published.
 
-<<<<<<< HEAD
 P.S. The full list of languages can be found at <https://javascript.info/translate>.
 =======
 **You can edit the text in any editor.** The tutorial uses enhanced "markdown" format, easy to grasp. And if you want to see how it looks on-site, there's a server to run the tutorial locally at <https://github.com/javascript-tutorial/server>.
->>>>>>> e1a3f634a47c119cf1ec7420c49fc0fc7172c0b5
+
 =======
 Something's wrong? A topic is missing? Explain it to people, add it as PR 👏
 
 **You can edit the text in any editor.** The tutorial uses an enhanced "markdown" format, easy to grasp. And if you want to see how it looks on-site, there's a server to run the tutorial locally at <https://github.com/javascript-tutorial/server>.
->>>>>>> ea7738bb7c3616bb51ff14ae3db2a2747d7888ff
+
 
 This repository hosts the translation of <https://javascript.info> in Danish.
 
@@ -65,7 +61,6 @@ P.S. The full list of languages can be found at <https://javascript.info/transla
 
 ## Structure
 
-<<<<<<< HEAD
 Every chapter, an article or a task resides in its own folder.
 
 The folder is named `N-url`, where `N` – is the number for sorting (articles are ordered), and `url` is the URL-slug on the site.
@@ -157,7 +152,6 @@ If you see that the English version can be improved – great, please send a PR
 Every chapter, article, or task has its folder.
 
 The folder is named like `N-url`, where `N` is a number for the sorting purposes and `URL` is the URL part with the title of the material.
->>>>>>> ea7738bb7c3616bb51ff14ae3db2a2747d7888ff
 
 
 ### Terms with meaning
@@ -242,7 +236,6 @@ Some files, usually tasks, have YAML metadata at the top, delimited by `---`:
 ```md
 importance: 5
 
-<<<<<<< HEAD
 ---
 ...
 ```
@@ -283,4 +276,3 @@ The server and install instructions are at <https://github.com/javascript-tutori
 ---  
 ♥  
 Ilya Kantor @iliakan
->>>>>>> e1a3f634a47c119cf1ec7420c49fc0fc7172c0b5