From ab0ea50da6826c733c5fd9ebfed453d07b558fda Mon Sep 17 00:00:00 2001
From: Masahiro FUJIMOTO <mfujimot@gmail.com>
Date: Mon, 9 Aug 2021 14:06:31 +0900
Subject: conflicting/Web/API/WebSockets_API を削除 (#1847)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/ja/_redirects.txt                            |  6 +++---
 files/ja/_wikihistory.json                         | 11 +++++-----
 .../conflicting/web/api/websockets_api/index.html  | 24 ----------------------
 3 files changed, 9 insertions(+), 32 deletions(-)
 delete mode 100644 files/ja/conflicting/web/api/websockets_api/index.html

(limited to 'files/ja')

diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index 4a5128a6f5..71483d41c1 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3448,7 +3448,7 @@
 /ja/docs/Web/API/WebGL_API/Lighting_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Lighting_in_WebGL
 /ja/docs/Web/API/WebGL_API/Using_shaders_to_apply_color_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Using_shaders_to_apply_color_in_WebGL
 /ja/docs/Web/API/WebGL_API/Using_textures_in_WebGL	/ja/docs/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL
-/ja/docs/Web/API/WebSockets_API/WebSockets_reference	/ja/docs/conflicting/Web/API/WebSockets_API
+/ja/docs/Web/API/WebSockets_API/WebSockets_reference	/ja/docs/Web/API/WebSockets_API
 /ja/docs/Web/API/WebVR_API/WebVR_concepts	/ja/docs/Web/API/WebVR_API/Concepts
 /ja/docs/Web/API/Web_Video_Text_Tracks_Format	/ja/docs/Web/API/WebVTT_API
 /ja/docs/Web/API/Window.dispatchEvent	/ja/docs/Web/API/EventTarget/dispatchEvent
@@ -4615,10 +4615,10 @@
 /ja/docs/WebGL/WebGL_best_practices	/ja/docs/Web/API/WebGL_API/WebGL_best_practices
 /ja/docs/WebSockets	/ja/docs/Web/API/WebSockets_API
 /ja/docs/WebSockets-840092-dup	/ja/docs/Web/API/WebSockets_API
-/ja/docs/WebSockets-840092-dup/WebSockets_reference	/ja/docs/conflicting/Web/API/WebSockets_API
+/ja/docs/WebSockets-840092-dup/WebSockets_reference	/ja/docs/Web/API/WebSockets_API
 /ja/docs/WebSockets-840092-dup/Writing_WebSocket_client_applications	/ja/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
 /ja/docs/WebSockets-840092-dup/Writing_WebSocket_servers	/ja/docs/Web/API/WebSockets_API/Writing_WebSocket_servers
-/ja/docs/WebSockets/WebSockets_reference	/ja/docs/conflicting/Web/API/WebSockets_API
+/ja/docs/WebSockets/WebSockets_reference	/ja/docs/Web/API/WebSockets_API
 /ja/docs/WebSockets/Writing_WebSocket_client_applications	/ja/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications
 /ja/docs/Web_Content_Accessibility_Guidelines_1.0	/ja/docs/orphaned/Web_Content_Accessibility_Guidelines_1.0
 /ja/docs/Web_Developer_Extension_(external)	https://addons.mozilla.org/ja/firefox/addon/60
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index d02acd767b..3d12291c36 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -48449,12 +48449,13 @@
       "Luna8bit"
     ]
   },
-  "conflicting/Web/API/WebSockets_API": {
-    "modified": "2019-03-23T23:32:19.540Z",
+  "conflicting/Web/API/URL": {
+    "modified": "2019-03-23T23:31:44.426Z",
     "contributors": [
-      "hamasaki",
-      "ethertank",
-      "suzukaze"
+      "YuichiNukiyama",
+      "fscholz",
+      "khalid32",
+      "ethertank"
     ]
   },
   "conflicting/Web/API/Window/moveTo": {
diff --git a/files/ja/conflicting/web/api/websockets_api/index.html b/files/ja/conflicting/web/api/websockets_api/index.html
deleted file mode 100644
index 86a4664747..0000000000
--- a/files/ja/conflicting/web/api/websockets_api/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: WebSockets リファレンス
-slug: conflicting/Web/API/WebSockets_API
-tags:
-  - WebSocket
-  - WebSockets
-translation_of: Web/API/WebSockets_API
-translation_of_original: Web/API/WebSockets_API/WebSockets_reference
-original_slug: Web/API/WebSockets_API/WebSockets_reference
----
-<div>{{draft}}</div>
-<p>以下のページは、WebSocket API のインタフェースに関する文書です。</p>
-
-
-<dl>
-  <dt><a href="/ja/docs/WebSockets/WebSockets_reference/WebSocket"><code>WebSocket</code></a></dt>
-  <dd>WebSocket のサーバに接続し、その接続上でデータを送受信するためのプライマリインターフェイス</dd>
-
-  <dt><a href="/ja/docs/WebSockets/WebSockets_reference/CloseEvent"><code>CloseEvent</code></a></dt>
-  <dd>接続を閉じる際に <code>WebSocket</code> オブジェクトによって送信されるイベント</dd>
-
-  <dt><a href="/ja/docs/WebSockets/WebSockets_reference/MessageEvent"><code>MessageEvent</code></a></dt>
-  <dd>サーバからのメッセージの受信時に <code>Websocket</code> オブジェクトによって送出されるイベント</dd>
-</dl>
-- 
cgit v1.2.3-54-g00ecf