aboutsummaryrefslogtreecommitdiff
path: root/files/ko
diff options
context:
space:
mode:
Diffstat (limited to 'files/ko')
-rw-r--r--files/ko/_redirects.txt12
-rw-r--r--files/ko/_wikihistory.json26
-rw-r--r--files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html (renamed from files/ko/web/api/rtcconfiguration/index.html)3
-rw-r--r--files/ko/conflicting/web/css/media_queries/using_media_queries/index.html (renamed from files/ko/web/progressive_web_apps/responsive/media_types/index.html)4
4 files changed, 24 insertions, 21 deletions
diff --git a/files/ko/_redirects.txt b/files/ko/_redirects.txt
index d6a4be6090..aed0b20724 100644
--- a/files/ko/_redirects.txt
+++ b/files/ko/_redirects.txt
@@ -30,7 +30,7 @@
/ko/docs/CSS/Getting_Started/Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/CSS/Getting_Started/How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/Getting_Started/JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/CSS/Getting_Started/Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS/Getting_Started/Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS/Getting_Started/SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/CSS/Getting_Started/Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS/Getting_Started/What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -66,7 +66,7 @@
/ko/docs/CSS/시작하기/CSS_동작_원리 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/시작하기/CSS란 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS/시작하기/내용물 /ko/docs/Learn/CSS/Howto/Generated_content
-/ko/docs/CSS/시작하기/미디어 /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS/시작하기/미디어 /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS/시작하기/색상 /en-US/docs/Learn/CSS/Building_blocks/Values_and_units
/ko/docs/CSS/시작하기/설렉터 /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS/시작하기/왜_CSS를_사용하나 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -76,7 +76,7 @@
/ko/docs/CSS:Getting_Started:Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/CSS:Getting_Started:How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/CSS:Getting_Started:JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/CSS:Getting_Started:Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/CSS:Getting_Started:Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/CSS:Getting_Started:SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/CSS:Getting_Started:Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/CSS:Getting_Started:What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -474,6 +474,7 @@
/ko/docs/Web/API/ParentNode/childElementCount /ko/docs/Web/API/Element/childElementCount
/ko/docs/Web/API/Position /ko/docs/Web/API/GeolocationPosition
/ko/docs/Web/API/PositionOptions /ko/docs/conflicting/Web/API/Geolocation/getCurrentPosition
+/ko/docs/Web/API/RTCConfiguration /ko/docs/conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
/ko/docs/Web/API/RandomSource /ko/docs/Web/API/Crypto/getRandomValues
/ko/docs/Web/API/RandomSource/getRandomValues /ko/docs/Web/API/Crypto/getRandomValues
/ko/docs/Web/API/Screen.lockOrientation /ko/docs/Web/API/Screen/lockOrientation
@@ -532,7 +533,7 @@
/ko/docs/Web/CSS/Getting_Started/Content /ko/docs/Learn/CSS/Howto/Generated_content
/ko/docs/Web/CSS/Getting_Started/How_CSS_works /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/Getting_Started/JavaScript /ko/docs/Learn/JavaScript/Client-side_web_APIs/Manipulating_documents
-/ko/docs/Web/CSS/Getting_Started/Media /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/Web/CSS/Getting_Started/Media /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/CSS/Getting_Started/SVG_graphics /ko/docs/Web/SVG/Tutorial/SVG_and_CSS
/ko/docs/Web/CSS/Getting_Started/Selectors /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/Web/CSS/Getting_Started/What_is_CSS /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -563,7 +564,7 @@
/ko/docs/Web/CSS/시작하기/CSS_동작_원리 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/시작하기/CSS란 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
/ko/docs/Web/CSS/시작하기/내용물 /ko/docs/Learn/CSS/Howto/Generated_content
-/ko/docs/Web/CSS/시작하기/미디어 /ko/docs/Web/Progressive_web_apps/Responsive/Media_types
+/ko/docs/Web/CSS/시작하기/미디어 /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/CSS/시작하기/색상 /en-US/docs/Learn/CSS/Building_blocks/Values_and_units
/ko/docs/Web/CSS/시작하기/설렉터 /en-US/docs/Learn/CSS/Building_blocks/Selectors
/ko/docs/Web/CSS/시작하기/왜_CSS를_사용하나 /en-US/docs/Learn/CSS/First_steps/How_CSS_works
@@ -684,6 +685,7 @@
/ko/docs/Web/Media/Formats/코덱파라미터 /ko/docs/Web/Media/Formats/codecs_parameter
/ko/docs/Web/Performance/브라우저는_어떻게_동작하는가 /ko/docs/Web/Performance/How_browsers_work
/ko/docs/Web/Performance/중요_렌더링_경로 /ko/docs/Web/Performance/Critical_rendering_path
+/ko/docs/Web/Progressive_web_apps/Responsive/Media_types /ko/docs/conflicting/Web/CSS/Media_Queries/Using_media_queries
/ko/docs/Web/Progressive_web_apps/소개 /ko/docs/Web/Progressive_web_apps/Introduction
/ko/docs/Web/Reference/Events /ko/docs/Web/Events
/ko/docs/Web/Reference/Events/DOMContentLoaded /ko/docs/Web/API/Window/DOMContentLoaded_event
diff --git a/files/ko/_wikihistory.json b/files/ko/_wikihistory.json
index c5aa83f753..81711a9810 100644
--- a/files/ko/_wikihistory.json
+++ b/files/ko/_wikihistory.json
@@ -6112,12 +6112,6 @@
"younheeJang"
]
},
- "Web/API/RTCConfiguration": {
- "modified": "2020-10-15T22:21:34.262Z",
- "contributors": [
- "chansbro"
- ]
- },
"Web/API/RTCDataChannelEvent": {
"modified": "2020-10-15T22:21:45.154Z",
"contributors": [
@@ -16248,13 +16242,6 @@
"cs09g"
]
},
- "Web/Progressive_web_apps/Responsive/Media_types": {
- "modified": "2019-03-23T23:33:02.082Z",
- "contributors": [
- "teoli",
- "SpikeYou"
- ]
- },
"Web/SVG": {
"modified": "2019-11-05T05:19:15.768Z",
"contributors": [
@@ -17544,6 +17531,12 @@
"Saem"
]
},
+ "conflicting/Web/API/RTCPeerConnection/RTCPeerConnection": {
+ "modified": "2020-10-15T22:21:34.262Z",
+ "contributors": [
+ "chansbro"
+ ]
+ },
"conflicting/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL": {
"modified": "2019-03-23T22:54:05.275Z",
"contributors": [
@@ -17580,6 +17573,13 @@
"jaemin_jo"
]
},
+ "conflicting/Web/CSS/Media_Queries/Using_media_queries": {
+ "modified": "2019-03-23T23:33:02.082Z",
+ "contributors": [
+ "teoli",
+ "SpikeYou"
+ ]
+ },
"conflicting/Web/Guide": {
"modified": "2019-03-23T23:41:47.329Z",
"contributors": [
diff --git a/files/ko/web/api/rtcconfiguration/index.html b/files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
index bc578aaf53..e96f592c1e 100644
--- a/files/ko/web/api/rtcconfiguration/index.html
+++ b/files/ko/conflicting/web/api/rtcpeerconnection/rtcpeerconnection/index.html
@@ -1,6 +1,6 @@
---
title: RTCConfiguration
-slug: Web/API/RTCConfiguration
+slug: conflicting/Web/API/RTCPeerConnection/RTCPeerConnection
tags:
- API
- Dictionary
@@ -8,6 +8,7 @@ tags:
- RTCConfiguration
- WebRTC
translation_of: Web/API/RTCConfiguration
+original_slug: Web/API/RTCConfiguration
---
<p>{{APIRef("WebRTC")}}{{draft}}</p>
diff --git a/files/ko/web/progressive_web_apps/responsive/media_types/index.html b/files/ko/conflicting/web/css/media_queries/using_media_queries/index.html
index 3c907f9c9b..d6e1f769a0 100644
--- a/files/ko/web/progressive_web_apps/responsive/media_types/index.html
+++ b/files/ko/conflicting/web/css/media_queries/using_media_queries/index.html
@@ -1,8 +1,8 @@
---
title: 미디어
-slug: Web/Progressive_web_apps/Responsive/Media_types
+slug: conflicting/Web/CSS/Media_Queries/Using_media_queries
translation_of: Web/Progressive_web_apps/Responsive/Media_types
-original_slug: Web/CSS/시작하기/미디어
+original_slug: Web/Progressive_web_apps/Responsive/Media_types
---
<p>{{ CSSTutorialTOC() }}</p>
<div class="warning">
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 11:45:10 +0000