aboutsummaryrefslogtreecommitdiff
path: root/files/ja/conflicting/web/javascript/reference
diff options
context:
space:
mode:
Diffstat (limited to 'files/ja/conflicting/web/javascript/reference')
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/json/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/string/lastindexof/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/lexical_grammar/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/operators/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/operators/yield/index.html3
-rw-r--r--files/ja/conflicting/web/javascript/reference/operators_f71733c8e7001a29c3ec40d8522a4aca/index.html4
12 files changed, 25 insertions, 12 deletions
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html
index 48ab4cab3b..c8cdd4711c 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/escape/index.html
@@ -1,6 +1,6 @@
---
title: window.escape
-slug: Web/API/Window/escape
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/escape
tags:
- DOM
- DOM_0
@@ -9,6 +9,7 @@ tags:
- Window
translation_of: Web/JavaScript/Reference/Global_Objects/escape
translation_of_original: Web/API/Window.escape
+original_slug: Web/API/Window/escape
---
<div>
{{ApiRef}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
index 5705852c36..1192084436 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/intl/datetimeformat/index.html
@@ -1,6 +1,6 @@
---
title: Intl.DateTimeFormat.prototype
-slug: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
tags:
- DateTimeFormat
- Internationalization
@@ -9,6 +9,7 @@ tags:
- Prototype
translation_of: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
translation_of_original: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/prototype
---
<div>{{JSRef}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/json/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/json/index.html
index a4f38307ea..514b59db12 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/json/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/json/index.html
@@ -1,8 +1,9 @@
---
title: ネイティブ JSON を使う
-slug: Using_native_JSON
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/JSON
translation_of: Web/JavaScript/Reference/Global_Objects/JSON
translation_of_original: Web/JavaScript/Guide/Using_native_JSON
+original_slug: Using_native_JSON
---
<div>{{gecko_minversion_header("1.9.1")}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/string/lastindexof/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/string/lastindexof/index.html
index 1dc9e038db..4d5869267a 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/string/lastindexof/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/string/lastindexof/index.html
@@ -1,10 +1,11 @@
---
title: lastIndexOf
-slug: lastIndexOf
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf
tags:
- Disambiguation
translation_of: Web/JavaScript/Reference/Global_Objects/String/lastIndexOf
translation_of_original: lastIndexOf
+original_slug: lastIndexOf
---
<p><strong>lastIndexOf</strong> は、いくつかの JavaScript オブジェクトが持つメソッドです。</p>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html
index 07564a02ee..64f70e8d54 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/unescape/index.html
@@ -1,6 +1,6 @@
---
title: window.unescape
-slug: Web/API/Window/unescape
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/unescape
tags:
- DOM
- DOM_0
@@ -9,6 +9,7 @@ tags:
- Window
translation_of: Web/JavaScript/Reference/Global_Objects/unescape
translation_of_original: Web/API/Window.unescape
+original_slug: Web/API/Window/unescape
---
<div>
{{ApiRef}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
index fedccef945..656d849574 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/instance/index.html
@@ -1,8 +1,9 @@
---
title: WebAssembly.Instance.prototype
-slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Instance/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
index 6d837f2f73..d02abab71d 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/memory/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Memory.prototype
-slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory
tags:
- JavaScript
- Property
@@ -9,6 +9,7 @@ tags:
- memory
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Memory/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
index 84709eb736..4903fcfbb1 100644
--- a/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
+++ b/files/ja/conflicting/web/javascript/reference/global_objects/webassembly/table/index.html
@@ -1,6 +1,6 @@
---
title: WebAssembly.Table.prototype
-slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table/prototype
+slug: conflicting/Web/JavaScript/Reference/Global_Objects/WebAssembly/Table
tags:
- JavaScript
- Property
@@ -9,6 +9,7 @@ tags:
- table
translation_of: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table
translation_of_original: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table/prototype
+original_slug: Web/JavaScript/Reference/Global_Objects/WebAssembly/Table/prototype
---
<div>{{JSRef}} {{SeeCompatTable}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/lexical_grammar/index.html b/files/ja/conflicting/web/javascript/reference/lexical_grammar/index.html
index fabc275890..e84c53c5d0 100644
--- a/files/ja/conflicting/web/javascript/reference/lexical_grammar/index.html
+++ b/files/ja/conflicting/web/javascript/reference/lexical_grammar/index.html
@@ -1,10 +1,11 @@
---
title: 予約語
-slug: Web/JavaScript/Reference/Reserved_Words
+slug: conflicting/Web/JavaScript/Reference/Lexical_grammar
tags:
- JavaScript
translation_of: Web/JavaScript/Reference/Lexical_grammar#Keywords
translation_of_original: Web/JavaScript/Reference/Reserved_Words
+original_slug: Web/JavaScript/Reference/Reserved_Words
---
<p>以下は予約語であり、変数、関数、メソッド、あるいはオブジェクトの識別子として用いることはできません。以下は <a href="/ja/docs/ECMAScript">ECMAScript</a> の仕様で既存のキーワードとして予約されているものです。</p>
diff --git a/files/ja/conflicting/web/javascript/reference/operators/index.html b/files/ja/conflicting/web/javascript/reference/operators/index.html
index 5010c8eb89..f835f4a57d 100644
--- a/files/ja/conflicting/web/javascript/reference/operators/index.html
+++ b/files/ja/conflicting/web/javascript/reference/operators/index.html
@@ -1,6 +1,6 @@
---
title: 比較演算子
-slug: Web/JavaScript/Reference/Operators/Comparison_Operators
+slug: conflicting/Web/JavaScript/Reference/Operators
tags:
- JavaScript
- Operator
@@ -8,6 +8,7 @@ tags:
- 演算子
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Comparison_Operators
+original_slug: Web/JavaScript/Reference/Operators/Comparison_Operators
---
<div>{{jsSidebar("Operators")}}</div>
diff --git a/files/ja/conflicting/web/javascript/reference/operators/yield/index.html b/files/ja/conflicting/web/javascript/reference/operators/yield/index.html
index 69be44e8d9..b2aad251c0 100644
--- a/files/ja/conflicting/web/javascript/reference/operators/yield/index.html
+++ b/files/ja/conflicting/web/javascript/reference/operators/yield/index.html
@@ -1,7 +1,8 @@
---
title: yield
-slug: Web/JavaScript/Reference/Statements/yield
+slug: conflicting/Web/JavaScript/Reference/Operators/yield
translation_of: Web/JavaScript/Reference/Operators/yield
translation_of_original: Web/JavaScript/Reference/Statements/yield
+original_slug: Web/JavaScript/Reference/Statements/yield
---
<p>『 <a href="/ja/docs/JavaScript/New_in_JavaScript/1.7">JavaScript 1.7 の新機能</a>』、『<a href="/ja/docs/JavaScript/Guide/Iterators_and_Generators">イテレータとジェネレータ</a>』 を参照して下さい。</p>
diff --git a/files/ja/conflicting/web/javascript/reference/operators_f71733c8e7001a29c3ec40d8522a4aca/index.html b/files/ja/conflicting/web/javascript/reference/operators_f71733c8e7001a29c3ec40d8522a4aca/index.html
index 8b43c3de26..01e3844b77 100644
--- a/files/ja/conflicting/web/javascript/reference/operators_f71733c8e7001a29c3ec40d8522a4aca/index.html
+++ b/files/ja/conflicting/web/javascript/reference/operators_f71733c8e7001a29c3ec40d8522a4aca/index.html
@@ -1,11 +1,13 @@
---
title: 論理演算子
-slug: Web/JavaScript/Reference/Operators/Logical_Operators
+slug: >-
+ conflicting/Web/JavaScript/Reference/Operators_f71733c8e7001a29c3ec40d8522a4aca
tags:
- JavaScript
- Operator
translation_of: Web/JavaScript/Reference/Operators
translation_of_original: Web/JavaScript/Reference/Operators/Logical_Operators
+original_slug: Web/JavaScript/Reference/Operators/Logical_Operators
---
<div>{{jsSidebar("Operators")}}</div>