Skip to content

Commit 3bda07b

Browse files
pocojangpocojang
committed
Update docs
2 parents 8216164 + 764cb47 commit 3bda07b

Some content is hidden

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

60 files changed

+40714
-4
lines changed

โ€Ž.gitignore

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
_book
22
.DS_Store
3+
<<<<<<< HEAD
4+
=======
5+
<<<<<<< HEAD
6+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
37
.idea/vcs.xml
48

59
# Created by https://www.gitignore.io/api/node,macos,windows,intellij,sublimetext,visualstudiocode
@@ -227,4 +231,12 @@ $RECYCLE.BIN/
227231
# Windows shortcuts
228232
*.lnk
229233

230-
# End of https://www.gitignore.io/api/node,macos,windows,intellij,sublimetext,visualstudiocode
234+
<<<<<<< HEAD
235+
# End of https://www.gitignore.io/api/node,macos,windows,intellij,sublimetext,visualstudiocode
236+
=======
237+
# End of https://www.gitignore.io/api/node,macos,windows,intellij,sublimetext,visualstudiocode
238+
=======
239+
.idea
240+
node_modules
241+
>>>>>>> master
242+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c

โ€ŽREADME.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ TypeScript ๋ฒˆ์—ญ์„ ํ•˜๋ฉฐ ์ „๋ฌธ์ ์ด๊ฑฐ๋‚˜ ์˜๋ฏธ๋ก ์ ์ธ ์ง€์‹์ด ๋งŽ์ด
1919
[์ด๊ณณ](https://github.com/typescript-kr/typescript-kr.github.io/blob/master/progress.md)์„ ํ†ตํ•ด ํ™•์ธํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
2020

2121
# ๊ธฐ์—ฌ
22+
<<<<<<< HEAD
2223
[๋ฒˆ์—ญ๊ฐ€์ด๋“œ ๋ฐ ๊ทœ์น™](https://github.com/typescript-kr/typescript-kr.github.io/wiki/translation-rules)์„ ์ฐธ๊ณ ํ•˜์—ฌ `develop ๋ธŒ๋žœ์น˜`์— PR ํ•ด์ฃผ์‹œ๋ฉด ๋ฉ๋‹ˆ๋‹ค.
24+
=======
25+
[๋ฒˆ์—ญ๊ฐ€์ด๋“œ ๋ฐ ๊ทœ์น™](https://github.com/typescript-kr/typescript-kr.github.io/wiki/translation-rules)์„ ์ฐธ๊ณ ํ•˜์—ฌ PR ํ•ด์ฃผ์‹œ๋ฉด ๋ฉ๋‹ˆ๋‹ค.
26+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
2327
2428
๊นƒํ—™ ์‚ฌ์šฉ์ด ์–ด๋ ต๊ฑฐ๋‚˜ ๊ฐ„๋‹จํ•œ ์˜๊ฒฌ ๊ฐ™์€ ๊ฒฝ์šฐ์—๋Š” [์ด์Šˆ](https://github.com/typescript-kr/typescript-kr.github.io/issues) ๋“ฑ๋ก์„ ํ•ด์ฃผ์‹œ๋ฉด ๊ฐ์‚ฌํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค
2529

โ€ŽSUMMARY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,8 @@
5252
* [Compiler Options](pages/Compiler Options.md)
5353
* [Compiler Options in MSBuild](pages/Compiler Options in MSBuild.md)
5454
* [Integrating with Build Tools](pages/Integrating with Build Tools.md)
55+
<<<<<<< HEAD
5556
* [Nightly Builds](pages/Nightly Builds.md)
57+
=======
58+
* [Nightly Builds](pages/Nightly Builds.md)
59+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c

โ€Žbook.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/typescript-kr/typescript-kr.github.io"
1414
},
1515
"sitemap": {
16-
"hostname": "https://typescript-kr.github.io"
16+
"hostname": "https://typescript-kr.github.io/"
1717
}
1818
}
1919
}

โ€Žgitbook/gitbook-plugin-forkmegithub/plugin.css

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.book .book-header {
2+
margin-right: 120px;
3+
}
4+
5+
.book .book-header h1 {
6+
padding-left: 140px;
7+
padding-right: 140px;
8+
}
9+
10+
a#forkmegithub img {
11+
position: absolute;
12+
top: 0;
13+
right: 0;
14+
border: 0;
15+
}
16+
17+
i.fa-github {
18+
display: none;
19+
}
20+
21+
@media (max-width:800px) {
22+
.book .book-header {
23+
margin-right: 0px;
24+
}
25+
26+
a#forkmegithub {
27+
display: none;
28+
}
29+
30+
i.fa-github {
31+
display: inline-block;
32+
}
33+
}
34+

โ€Žgitbook/gitbook-plugin-forkmegithub/plugin.js

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
require(['gitbook', 'jQuery'], function (gitbook, $) {
2+
var colorRibbons = {
3+
red: {
4+
src: 'https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67',
5+
canonicalSrc: 'https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png',
6+
},
7+
green: {
8+
src: 'https://camo.githubusercontent.com/e7bbb0521b397edbd5fe43e7f760759336b5e05f/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67',
9+
canonicalSrc: 'https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png',
10+
},
11+
darkblue: {
12+
src: 'https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67',
13+
canonicalSrc: 'https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png',
14+
},
15+
orange: {
16+
src: 'https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67',
17+
canonicalSrc: 'https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png',
18+
},
19+
gray: {
20+
src: 'https://camo.githubusercontent.com/a6677b08c955af8400f44c6298f40e7d19cc5b2d/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67',
21+
canonicalSrc: 'https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png',
22+
},
23+
};
24+
25+
var forkmeRibbon;
26+
var pluginConfig = {};
27+
function initializePlugin(config) {
28+
pluginConfig = config.forkmegithub;
29+
30+
var colorRibbon = colorRibbons[pluginConfig.color];
31+
forkmeRibbon
32+
= '<a id="forkmegithub" href="' + pluginConfig.url + '">'
33+
+ '<img src="' + colorRibbon.src + '" alt="Fork me on GitHub"'
34+
+ 'data-canonical-src="' + colorRibbon.canonicalSrc + '"></img>'
35+
+ '</a>'
36+
;
37+
}
38+
39+
function getPluginConfig() {
40+
return pluginConfig;
41+
}
42+
43+
gitbook.events.bind('start', function (e, config) {
44+
initializePlugin(config);
45+
46+
gitbook.toolbar.createButton({
47+
icon: 'fa fa-github',
48+
label: 'GitHub',
49+
position: 'right',
50+
onClick: function() {
51+
window.open(pluginConfig.url);
52+
}
53+
});
54+
});
55+
56+
gitbook.events.bind('page.change', function() {
57+
var bodyInner = $('.book .book-body .body-inner');
58+
bodyInner.append(forkmeRibbon);
59+
});
60+
});
61+

โ€Žgooglee9f11f9e5eb0999e.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
google-site-verification: googlee9f11f9e5eb0999e.html

โ€Žindex.html

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<head>
55
<meta charset="UTF-8">
66
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
7+
<<<<<<< HEAD
78
<title>TypeScript ํ•œ๊ธ€ ๋ฌธ์„œ</title>
89
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
910
<meta name="description" content="">
@@ -13,6 +14,14 @@
1314
<meta property="og:title" content="TypeScript ํ•œ๊ธ€ ๋ฌธ์„œ">
1415
<meta property="og:image" content="./gitbook/images/favicon.ico">
1516
<meta property="og:description" content="TypeScript ํ•œ๊ธ€ ๋ฒˆ์—ญ ๋ฌธ์„œ์ž…๋‹ˆ๋‹ค">
17+
=======
18+
<title>์†Œ๊ฐœ ยท GitBook</title>
19+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
20+
<meta name="description" content="">
21+
<meta name="generator" content="GitBook 3.2.3">
22+
23+
24+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
1625

1726

1827

@@ -115,7 +124,11 @@
115124

116125

117126

127+
<<<<<<< HEAD
118128
<li class="header">Tutorials</li>
129+
=======
130+
<li class="header">ํŠœํ† ๋ฆฌ์–ผ</li>
131+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
119132

120133

121134

@@ -187,7 +200,11 @@
187200

188201

189202

203+
<<<<<<< HEAD
190204
<li class="header">Handbook</li>
205+
=======
206+
<li class="header">ํ•ธ๋“œ๋ถ</li>
207+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
191208

192209

193210

@@ -339,7 +356,11 @@
339356
<a href="pages/Iterators and Generators.html">
340357

341358

359+
<<<<<<< HEAD
342360
Iterators and Generators
361+
=======
362+
์ดํ„ฐ๋ ˆ์ดํ„ฐ์™€ ์ œ๋„ค๋ ˆ์ดํ„ฐ
363+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
343364

344365
</a>
345366

@@ -352,7 +373,11 @@
352373
<a href="pages/Modules.html">
353374

354375

376+
<<<<<<< HEAD
355377
Modules
378+
=======
379+
๋ชจ๋“ˆ
380+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
356381

357382
</a>
358383

@@ -365,7 +390,11 @@
365390
<a href="pages/Namespaces.html">
366391

367392

393+
<<<<<<< HEAD
368394
Namespaces
395+
=======
396+
๋„ค์ž„์ŠคํŽ˜์ด์Šค
397+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
369398

370399
</a>
371400

@@ -378,7 +407,11 @@
378407
<a href="pages/Namespaces and Modules.html">
379408

380409

410+
<<<<<<< HEAD
381411
Namespaces and Modules
412+
=======
413+
๋„ค์ž„์ŠคํŽ˜์ด์Šค์™€ ๋ชจ๋“ˆ
414+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
382415

383416
</a>
384417

@@ -391,7 +424,11 @@
391424
<a href="pages/Module Resolution.html">
392425

393426

427+
<<<<<<< HEAD
394428
Module Resolution
429+
=======
430+
๋ชจ๋“ˆ ํ•ด์„
431+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
395432

396433
</a>
397434

@@ -404,7 +441,11 @@
404441
<a href="pages/Declaration Merging.html">
405442

406443

444+
<<<<<<< HEAD
407445
Declaration Merging
446+
=======
447+
์„ ์–ธ ๋ณ‘ํ•ฉ
448+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
408449

409450
</a>
410451

@@ -634,9 +675,15 @@
634675

635676
</li>
636677

678+
<<<<<<< HEAD
637679
<li class="chapter " data-level="5.4" data-path="pages/Iterators and Generators.html">
638680

639681
<a href="pages/Iterators and Generators.html">
682+
=======
683+
<li class="chapter " data-level="5.4" data-path="pages/Integrating with Build Tools.html">
684+
685+
<a href="pages/Integrating with Build Tools.html">
686+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
640687

641688

642689
Integrating with Build Tools
@@ -705,6 +752,7 @@ <h1>
705752

706753
<section class="normal markdown-section">
707754

755+
<<<<<<< HEAD
708756
<h1 id="typescript-handbook-&#xD55C;&#xAE00;-&#xBC88;&#xC5ED;">TypeScript-Handbook &#xD55C;&#xAE00; &#xBC88;&#xC5ED;</h1>
709757
<p><a href="https://travis-ci.org/Microsoft/TypeScript-Handbook" target="_blank"><img src="https://travis-ci.org/Microsoft/TypeScript-Handbook.svg" alt="Build Status"></a></p>
710758
<p><a href="https://www.typescriptlang.org/docs/handbook/basic-types.html" target="_blank">TypeScript Handbook</a>&#xC744; &#xACF5;&#xB3D9; &#xBC88;&#xC5ED;&#xD558;&#xB294; &#xC800;&#xC7A5;&#xC18C;&#xC785;&#xB2C8;&#xB2E4;.</p>
@@ -720,6 +768,20 @@ <h2 id="&#xAE30;&#xC5EC;&#xC790;">&#xAE30;&#xC5EC;&#xC790;</h2>
720768
<li><a href="https://github.com/rudwnok123" target="_blank">&#xC774;&#xACBD;&#xC8FC;</a></li>
721769
<li><a href="https://github.com/kimyeaseul" target="_blank">&#xAE40;&#xC608;&#xC2AC;</a></li>
722770
</ul>
771+
=======
772+
<h1 id="typescript-handbook-&#xD55C;&#xAE00;-&#xBB38;&#xC11C;">TypeScript-Handbook &#xD55C;&#xAE00; &#xBB38;&#xC11C;</h1>
773+
<p><a href="https://travis-ci.org/Microsoft/TypeScript-Handbook" target="_blank"><img src="https://travis-ci.org/Microsoft/TypeScript-Handbook.svg" alt="Build Status"></a></p>
774+
<p><a href="https://www.typescriptlang.org/docs/handbook/basic-types.html" target="_blank">TypeScript Handbook</a>&#xC744; &#xBC88;&#xC5ED;&#xD558;&#xB294; &#xC800;&#xC7A5;&#xC18C;&#xC785;&#xB2C8;&#xB2E4;.</p>
775+
<p>&#xC758;&#xC5ED; &#xBC0F; &#xC624;&#xC5ED;&#xC774; &#xC874;&#xC7AC;&#xD560; &#xC218; &#xC788;&#xC2B5;&#xB2C8;&#xB2E4;.</p>
776+
<h1 id="&#xBC88;&#xC5ED;-&#xBC94;&#xC704;">&#xBC88;&#xC5ED; &#xBC94;&#xC704;</h1>
777+
<p><a href="https://www.typescriptlang.org/docs/handbook/basic-types.html" target="_blank">TypeScript Handbook</a>&#xC758; &#xBAA8;&#xB4E0; &#xD398;&#xC774;&#xC9C0;&#xB97C; &#xBC88;&#xC5ED;&#xD560; &#xC608;&#xC815;&#xC785;&#xB2C8;&#xB2E4;.</p>
778+
<h1 id="&#xC9C4;&#xD589;-&#xC0C1;&#xD669;">&#xC9C4;&#xD589; &#xC0C1;&#xD669;</h1>
779+
<p><a href="https://github.com/typescript-study/typescript-study.github.io/blob/master/progress.md" target="_blank">&#xC774;&#xACF3;</a>&#xC744; &#xD1B5;&#xD574; &#xD655;&#xC778;&#xD560; &#xC218; &#xC788;&#xC2B5;&#xB2C8;&#xB2E4;.</p>
780+
<h1 id="&#xAE30;&#xC5EC;">&#xAE30;&#xC5EC;</h1>
781+
<p><a href="https://github.com/typescript-study/docuement-wiki/wiki/translation-rules" target="_blank">&#xBC88;&#xC5ED;&#xAC00;&#xC774;&#xB4DC; &#xBC0F; &#xADDC;&#xCE59;</a>&#xC744; &#xCC38;&#xACE0;&#xD558;&#xC5EC; PR &#xD574;&#xC8FC;&#xC2DC;&#xBA74; &#xB429;&#xB2C8;&#xB2E4;.</p>
782+
<p>&#xAE43;&#xD5D9; &#xC0AC;&#xC6A9;&#xC774; &#xC5B4;&#xB835;&#xAC70;&#xB098; &#xAC04;&#xB2E8;&#xD55C; &#xC758;&#xACAC; &#xAC19;&#xC740; &#xACBD;&#xC6B0;&#xC5D0;&#xB294; <a href="https://github.com/typescript-study/typescript-study.github.io/issues" target="_blank">&#xC774;&#xC288;</a> &#xB4F1;&#xB85D;&#xC744; &#xD574;&#xC8FC;&#xC2DC;&#xBA74; &#xAC10;&#xC0AC;&#xD558;&#xACA0;&#xC2B5;&#xB2C8;&#xB2E4;</p>
783+
<p>&#xADF8; &#xBC16;&#xC5D0;&#xB3C4; &#xB2E4;&#xC591;&#xD55C; &#xC758;&#xACAC; &#xBC0F; &#xD53C;&#xB4DC;&#xBC31;&#xC740; &#xC5B8;&#xC81C;&#xB098; &#xD658;&#xC601;&#xD569;&#xB2C8;&#xB2E4;:)</p>
784+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
723785

724786

725787
</section>
@@ -759,7 +821,11 @@ <h1 class="search-results-title">No results matching "<span class='search-query'
759821
<script>
760822
var gitbook = gitbook || [];
761823
gitbook.push(function() {
824+
<<<<<<< HEAD
762825
gitbook.page.hasChanged({"page":{"title":"์†Œ๊ฐœ","level":"1.1","depth":1,"next":{"title":"5๋ถ„ ์•ˆ์— ๋ณด๋Š” TypeScript","level":"2.1","depth":1,"path":"pages/tutorials/TypeScript in 5 minutes.md","ref":"pages/tutorials/TypeScript in 5 minutes.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["theme-darkblue","addcssjs","highlight-1","custom-favicon"],"pluginsConfig":{"search":{},"addcssjs":{"js":[],"css":["assets/css/atom-one-dark.css"]},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-darkblue":{},"highlight":{},"favicon":"assets/images/favicon.ico","highlight-1":{},"custom-favicon":{},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"README.md","mtime":"2018-02-15T11:46:40.502Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-02-16T05:21:38.612Z"},"basePath":".","book":{"language":""}});
826+
=======
827+
gitbook.page.hasChanged({"page":{"title":"์†Œ๊ฐœ","level":"1.1","depth":1,"next":{"title":"5๋ถ„ ์•ˆ์— ๋ณด๋Š” TypeScript","level":"2.1","depth":1,"path":"pages/tutorials/TypeScript in 5 minutes.md","ref":"pages/tutorials/TypeScript in 5 minutes.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["theme-darkblue","addcssjs","highlight-1","custom-favicon"],"pluginsConfig":{"search":{},"addcssjs":{"js":[],"css":["assets/css/atom-one-dark.css"]},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-darkblue":{},"highlight":{},"favicon":"assets/images/favicon.ico","highlight-1":{},"custom-favicon":{},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"README.md","mtime":"2018-04-10T01:42:20.261Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2018-04-10T01:48:44.756Z"},"basePath":".","book":{"language":""}});
828+
>>>>>>> 764cb472fb0987a1c9354cebc6699cc41293004c
763829
});
764830
</script>
765831
</div>

0 commit comments

Comments
ย (0)