diff options
Diffstat (limited to 'files/ja/conflicting/web')
91 files changed, 188 insertions, 94 deletions
diff --git a/files/ja/conflicting/web/accessibility/aria/index.html b/files/ja/conflicting/web/accessibility/aria/index.html index df17bbcfbb..1bd4eef237 100644 --- a/files/ja/conflicting/web/accessibility/aria/index.html +++ b/files/ja/conflicting/web/accessibility/aria/index.html @@ -1,6 +1,6 @@ --- title: Accessible Rich Internet Applications -slug: ARIA/Accessible_Rich_Internet_Applications +slug: conflicting/Web/Accessibility/ARIA tags: - AJAX - Accessibility @@ -8,6 +8,7 @@ tags: - DOM translation_of: Web/Accessibility/ARIA translation_of_original: ARIA/Accessible_Rich_Internet_Applications +original_slug: ARIA/Accessible_Rich_Internet_Applications --- <p> </p> <p>Accessibility Rich Internet Applications(ARIA) の Firefox による実装は、ツリービューやメニューバー、表計算などのデスクトップスタイルのウィジェットを、キーボードとスクリーンリーダや拡大鏡、代替入力機器などの支援技術から利用可能にします。また、ページ上で一部を AJAX スタイルのライブアップデートを行う際のアクセシビリティの解決策を提供します。</p> diff --git a/files/ja/conflicting/web/api/canvas_api/tutorial/index.html b/files/ja/conflicting/web/api/canvas_api/tutorial/index.html index b84af866ef..8760b0c3de 100644 --- a/files/ja/conflicting/web/api/canvas_api/tutorial/index.html +++ b/files/ja/conflicting/web/api/canvas_api/tutorial/index.html @@ -1,6 +1,6 @@ --- title: canvas チュートリアル -slug: Web/Guide/HTML/Canvas_tutorial +slug: conflicting/Web/API/Canvas_API/Tutorial tags: - Canvas - Graphics @@ -10,6 +10,7 @@ tags: - Intermediate - Web translation_of: Web/API/Canvas_API/Tutorial +original_slug: Web/Guide/HTML/Canvas_tutorial --- <div>{{CanvasSidebar}}</div> diff --git a/files/ja/conflicting/web/api/canvas_api/tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d/index.html b/files/ja/conflicting/web/api/canvas_api/tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d/index.html index be09a119f7..bf51c504f4 100644 --- a/files/ja/conflicting/web/api/canvas_api/tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d/index.html +++ b/files/ja/conflicting/web/api/canvas_api/tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d/index.html @@ -1,12 +1,13 @@ --- title: canvas に絵を描く -slug: Web/API/Canvas_API/Drawing_graphics_with_canvas +slug: conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d tags: - HTML - HTML5 - - 'HTML:Canvas' + - HTML:Canvas translation_of: Web/API/Canvas_API/Tutorial translation_of_original: Web/API/Canvas_API/Drawing_graphics_with_canvas +original_slug: Web/API/Canvas_API/Drawing_graphics_with_canvas --- <div class="note"> <p>このページには、一部古い内容が含まれています。</p> diff --git a/files/ja/conflicting/web/api/crypto/getrandomvalues/index.html b/files/ja/conflicting/web/api/crypto/getrandomvalues/index.html index 5972564d98..4d0db8e4d1 100644 --- a/files/ja/conflicting/web/api/crypto/getrandomvalues/index.html +++ b/files/ja/conflicting/web/api/crypto/getrandomvalues/index.html @@ -1,6 +1,6 @@ --- title: RandomSource -slug: Web/API/RandomSource +slug: conflicting/Web/API/Crypto/getRandomValues tags: - API - Interface @@ -9,6 +9,7 @@ tags: - Web Crypto API translation_of: Web/API/Crypto/getRandomValues translation_of_original: Web/API/RandomSource +original_slug: Web/API/RandomSource --- <p>{{APIRef("Web Crypto API")}}</p> diff --git a/files/ja/conflicting/web/api/css_object_model/determining_the_dimensions_of_elements/index.html b/files/ja/conflicting/web/api/css_object_model/determining_the_dimensions_of_elements/index.html index c09e67595e..42584cb900 100644 --- a/files/ja/conflicting/web/api/css_object_model/determining_the_dimensions_of_elements/index.html +++ b/files/ja/conflicting/web/api/css_object_model/determining_the_dimensions_of_elements/index.html @@ -1,8 +1,9 @@ --- title: Determining the dimensions of elements -slug: Determining_the_dimensions_of_elements +slug: conflicting/Web/API/CSS_Object_Model/Determining_the_dimensions_of_elements tags: - DOM +original_slug: Determining_the_dimensions_of_elements --- <p><span class="CRHTML_TXN"><span id="eq00000g00003">要素の幅と高さを知るためのプロパティはいくつかあり、本当に求めているプロパティがどれであるかわかりにくいことがあります。このページでは目的に応じてどのプロパティを使用すれば良いか説明します。</span></span></p> diff --git a/files/ja/conflicting/web/api/document/characterset/index.html b/files/ja/conflicting/web/api/document/characterset/index.html index bc128b09e8..cd66d4f362 100644 --- a/files/ja/conflicting/web/api/document/characterset/index.html +++ b/files/ja/conflicting/web/api/document/characterset/index.html @@ -1,6 +1,6 @@ --- title: document.inputEncoding -slug: Web/API/Document/inputEncoding +slug: conflicting/Web/API/Document/characterSet tags: - DOM - Document @@ -8,6 +8,7 @@ tags: - Gecko DOM Reference translation_of: Web/API/Document/characterSet translation_of_original: Web/API/Document/inputEncoding +original_slug: Web/API/Document/inputEncoding --- <p>{{ApiRef}} {{deprecated_header}}</p> <h2 id="Summary" name="Summary">概要</h2> diff --git a/files/ja/conflicting/web/api/document/createevent/index.html b/files/ja/conflicting/web/api/document/createevent/index.html index d9dc6aef3f..c4dd08ff84 100644 --- a/files/ja/conflicting/web/api/document/createevent/index.html +++ b/files/ja/conflicting/web/api/document/createevent/index.html @@ -1,8 +1,9 @@ --- title: Event.createEvent() -slug: Web/API/Event/createEvent +slug: conflicting/Web/API/Document/createEvent translation_of: Web/API/Document/createEvent translation_of_original: Web/API/Event/createEvent +original_slug: Web/API/Event/createEvent --- <p>{{APIRef("DOM")}}</p> diff --git a/files/ja/conflicting/web/api/document_object_model/index.html b/files/ja/conflicting/web/api/document_object_model/index.html index 5bd2ec6ada..3acbb1487f 100644 --- a/files/ja/conflicting/web/api/document_object_model/index.html +++ b/files/ja/conflicting/web/api/document_object_model/index.html @@ -1,5 +1,6 @@ --- title: DOM Client Object Cross-Reference -slug: DOM_Client_Object_Cross-Reference +slug: conflicting/Web/API/Document_Object_Model +original_slug: DOM_Client_Object_Cross-Reference --- {{wiki.localize('System.API.page-generated-for-subpage')}} diff --git a/files/ja/conflicting/web/api/document_object_model_226486dcf4878082093d6899a9e478cc/index.html b/files/ja/conflicting/web/api/document_object_model_226486dcf4878082093d6899a9e478cc/index.html index 736d3074ba..1e7a64cc83 100644 --- a/files/ja/conflicting/web/api/document_object_model_226486dcf4878082093d6899a9e478cc/index.html +++ b/files/ja/conflicting/web/api/document_object_model_226486dcf4878082093d6899a9e478cc/index.html @@ -1,10 +1,11 @@ --- title: DOM (Document Object Model) について -slug: DOM/About_the_Document_Object_Model +slug: conflicting/Web/API/Document_Object_Model_226486dcf4878082093d6899a9e478cc tags: - DOM translation_of: Web/API/Document_Object_Model translation_of_original: DOM/About_the_Document_Object_Model +original_slug: DOM/About_the_Document_Object_Model --- <h2 id="What_is_the_DOM.3F" name="What_is_the_DOM.3F">DOM とは何か?</h2> <p><a href="/ja/docs/DOM">Document Object Model</a> は <a href="/ja/docs/HTML">HTML</a> と <a href="/ja/docs/XML">XML</a> ドキュメントへの API です。これは、ドキュメントの構造的な表現、その内容を変更可能にすること、そして視覚的なプレゼンテーションを提供します。本質的には、ウェブページをスクリプト又はプログラミング言語と結合します。</p> diff --git a/files/ja/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html b/files/ja/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html index dcee4acf84..40cf5d3393 100644 --- a/files/ja/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html +++ b/files/ja/conflicting/web/api/document_object_model_656f0e51418b39c498011268be9b3a10/index.html @@ -1,6 +1,6 @@ --- title: DOM developer guide -slug: Web/Guide/DOM +slug: conflicting/Web/API/Document_Object_Model_656f0e51418b39c498011268be9b3a10 tags: - API - DOM @@ -9,6 +9,7 @@ tags: - TopicStub translation_of: Web/API/Document_Object_Model translation_of_original: Web/Guide/API/DOM +original_slug: Web/Guide/DOM --- <p>{{draft}}</p> diff --git a/files/ja/conflicting/web/api/document_object_model_8435a25d5137b436d5d7161e1b813c02/index.html b/files/ja/conflicting/web/api/document_object_model_8435a25d5137b436d5d7161e1b813c02/index.html index 4a390b9177..d822004334 100644 --- a/files/ja/conflicting/web/api/document_object_model_8435a25d5137b436d5d7161e1b813c02/index.html +++ b/files/ja/conflicting/web/api/document_object_model_8435a25d5137b436d5d7161e1b813c02/index.html @@ -1,12 +1,13 @@ --- title: 序文 -slug: Web/API/Document_Object_Model/Preface +slug: conflicting/Web/API/Document_Object_Model_8435a25d5137b436d5d7161e1b813c02 tags: - DOM - Gecko - Gecko DOM Reference translation_of: Web/API/Document_Object_Model translation_of_original: Web/API/Document_Object_Model/Preface +original_slug: Web/API/Document_Object_Model/Preface --- <div> {{ApiRef}}</div> diff --git a/files/ja/conflicting/web/api/documentorshadowroot/getselection/index.html b/files/ja/conflicting/web/api/documentorshadowroot/getselection/index.html index 740d006c66..9931991d62 100644 --- a/files/ja/conflicting/web/api/documentorshadowroot/getselection/index.html +++ b/files/ja/conflicting/web/api/documentorshadowroot/getselection/index.html @@ -1,6 +1,6 @@ --- title: document.getSelection -slug: Web/API/Document/getSelection +slug: conflicting/Web/API/DocumentOrShadowRoot/getSelection tags: - DOM - Document @@ -8,6 +8,7 @@ tags: - Selection translation_of: Web/API/DocumentOrShadowRoot/getSelection translation_of_original: Web/API/Document/getSelection +original_slug: Web/API/Document/getSelection --- <p>DOM の <code>getSelection()</code> メソッドは、 {{domxref("Window")}} インタフェース及び {{domxref("Document")}} インタフェースで利用可能です。<br> 詳細については {{domxref("window.getSelection()")}} の頁を参照して下さい。</p> diff --git a/files/ja/conflicting/web/api/documentorshadowroot/index.html b/files/ja/conflicting/web/api/documentorshadowroot/index.html index a7953136e6..3d76892dbe 100644 --- a/files/ja/conflicting/web/api/documentorshadowroot/index.html +++ b/files/ja/conflicting/web/api/documentorshadowroot/index.html @@ -1,6 +1,6 @@ --- title: DocumentOrShadowRoot.nodeFromPoint() -slug: Web/API/DocumentOrShadowRoot/nodeFromPoint +slug: conflicting/Web/API/DocumentOrShadowRoot tags: - API - DocumentOrShadowRoot @@ -12,6 +12,7 @@ tags: - 標準外 translation_of: Web/API/DocumentOrShadowRoot translation_of_original: Web/API/DocumentOrShadowRoot/nodeFromPoint +original_slug: Web/API/DocumentOrShadowRoot/nodeFromPoint --- <div>{{APIRef("DOM")}}{{Non-standard_header}}</div> diff --git a/files/ja/conflicting/web/api/documentorshadowroot_20ea0e1d91453a020aad3a16dbce16f1/index.html b/files/ja/conflicting/web/api/documentorshadowroot_20ea0e1d91453a020aad3a16dbce16f1/index.html index d3f79b8d11..f76b47288f 100644 --- a/files/ja/conflicting/web/api/documentorshadowroot_20ea0e1d91453a020aad3a16dbce16f1/index.html +++ b/files/ja/conflicting/web/api/documentorshadowroot_20ea0e1d91453a020aad3a16dbce16f1/index.html @@ -1,6 +1,6 @@ --- title: DocumentOrShadowRoot.nodesFromPoint() -slug: Web/API/DocumentOrShadowRoot/nodesFromPoint +slug: conflicting/Web/API/DocumentOrShadowRoot_20ea0e1d91453a020aad3a16dbce16f1 tags: - API - DocumentOrShadowRoot @@ -11,6 +11,7 @@ tags: - メソッド translation_of: Web/API/DocumentOrShadowRoot translation_of_original: Web/API/DocumentOrShadowRoot/nodesFromPoint +original_slug: Web/API/DocumentOrShadowRoot/nodesFromPoint --- <div>{{APIRef("DOM")}}{{Non-standard_header}}</div> diff --git a/files/ja/conflicting/web/api/element/compositionstart_event/index.html b/files/ja/conflicting/web/api/element/compositionstart_event/index.html index e02e6c35ef..a4d5956f6d 100644 --- a/files/ja/conflicting/web/api/element/compositionstart_event/index.html +++ b/files/ja/conflicting/web/api/element/compositionstart_event/index.html @@ -1,6 +1,6 @@ --- title: compositionstart -slug: Web/Events/compositionstart +slug: conflicting/Web/API/Element/compositionstart_event tags: - DOM - Event @@ -9,6 +9,7 @@ tags: - 要更新 translation_of: Web/API/Element/compositionstart_event translation_of_original: DOM/DOM_event_reference/compositionstart +original_slug: Web/Events/compositionstart --- <p>DOM <code>compositionstart</code> イベントはユーザがIMEで未確定文字列の入力を開始した時のように、間接的なテキスト入力を開始した時に同期的に発生します。このイベントは {{ domxref("CompositionEvent") }} インターフェースを持ちます。</p> <div class="note"> diff --git a/files/ja/conflicting/web/api/element/index.html b/files/ja/conflicting/web/api/element/index.html index 859be5e107..b529d40b17 100644 --- a/files/ja/conflicting/web/api/element/index.html +++ b/files/ja/conflicting/web/api/element/index.html @@ -1,6 +1,6 @@ --- title: Slotable -slug: Web/API/Slotable +slug: conflicting/Web/API/Element tags: - API - Interface @@ -10,6 +10,7 @@ tags: - shadow dom translation_of: Web/API/Slottable translation_of_original: Web/API/Slotable +original_slug: Web/API/Slotable --- <p>{{APIRef("Shadow DOM")}}</p> diff --git a/files/ja/conflicting/web/api/formdata/using_formdata_objects/index.html b/files/ja/conflicting/web/api/formdata/using_formdata_objects/index.html index 605885878f..f455f65eb9 100644 --- a/files/ja/conflicting/web/api/formdata/using_formdata_objects/index.html +++ b/files/ja/conflicting/web/api/formdata/using_formdata_objects/index.html @@ -1,6 +1,6 @@ --- title: FormData オブジェクトの利用 -slug: Web/Guide/Using_FormData_Objects +slug: conflicting/Web/API/FormData/Using_FormData_Objects tags: - Advanced - Example @@ -10,6 +10,7 @@ tags: - Web translation_of: Web/API/FormData/Using_FormData_Objects translation_of_original: Web/Guide/Using_FormData_Objects +original_slug: Web/Guide/Using_FormData_Objects --- <p class="summary"><code><a href="/ja/docs/Web/API/FormData">FormData</a></code> オブジェクトは、<code><a href="/ja/docs/Web/API/XMLHttpRequest">XMLHttpRequest</a></code> を使用して送信するためのキーと値のペアのセットを収集可能にします。本来はフォームデータの送信に使用することを想定していましたが、キーのついたデータを伝送するためにフォームとは独立して使用することもできます。伝送されるデータは、フォームのエンコードタイプが <code>multipart/form-data</code> に設定されている場合に、{{domxref("HTMLFormElement.submit","submit()")}} メソッドで送信する際に使用するデータと同じ形式です。</p> diff --git a/files/ja/conflicting/web/api/globaleventhandlers/onclick/index.html b/files/ja/conflicting/web/api/globaleventhandlers/onclick/index.html index ac36968fa6..d1d0d29cff 100644 --- a/files/ja/conflicting/web/api/globaleventhandlers/onclick/index.html +++ b/files/ja/conflicting/web/api/globaleventhandlers/onclick/index.html @@ -1,6 +1,6 @@ --- title: window.onclick -slug: Web/API/Window/onclick +slug: conflicting/Web/API/GlobalEventHandlers/onclick tags: - DOM - Gecko @@ -8,6 +8,7 @@ tags: - Window translation_of: Web/API/GlobalEventHandlers/onclick translation_of_original: Web/API/Window/onclick +original_slug: Web/API/Window/onclick --- <div> {{ApiRef}}</div> diff --git a/files/ja/conflicting/web/api/globaleventhandlers/onmousedown/index.html b/files/ja/conflicting/web/api/globaleventhandlers/onmousedown/index.html index b5f947f8be..a032550510 100644 --- a/files/ja/conflicting/web/api/globaleventhandlers/onmousedown/index.html +++ b/files/ja/conflicting/web/api/globaleventhandlers/onmousedown/index.html @@ -1,6 +1,6 @@ --- title: window.onmousedown -slug: Web/API/Window/onmousedown +slug: conflicting/Web/API/GlobalEventHandlers/onmousedown tags: - DOM - Gecko @@ -8,6 +8,7 @@ tags: - Window translation_of: Web/API/GlobalEventHandlers/onmousedown translation_of_original: Web/API/Window/onmousedown +original_slug: Web/API/Window/onmousedown --- <div> {{ApiRef}}</div> diff --git a/files/ja/conflicting/web/api/globaleventhandlers/onmouseup/index.html b/files/ja/conflicting/web/api/globaleventhandlers/onmouseup/index.html index f7133126a9..6424230eb8 100644 --- a/files/ja/conflicting/web/api/globaleventhandlers/onmouseup/index.html +++ b/files/ja/conflicting/web/api/globaleventhandlers/onmouseup/index.html @@ -1,6 +1,6 @@ --- title: window.onmouseup -slug: Web/API/Window/onmouseup +slug: conflicting/Web/API/GlobalEventHandlers/onmouseup tags: - DOM - Gecko @@ -8,6 +8,7 @@ tags: - Window translation_of: Web/API/GlobalEventHandlers/onmouseup translation_of_original: Web/API/Window/onmouseup +original_slug: Web/API/Window/onmouseup --- <div> {{ApiRef}}</div> diff --git a/files/ja/conflicting/web/api/html_drag_and_drop_api/index.html b/files/ja/conflicting/web/api/html_drag_and_drop_api/index.html index 6b9a4be242..8313a17c44 100644 --- a/files/ja/conflicting/web/api/html_drag_and_drop_api/index.html +++ b/files/ja/conflicting/web/api/html_drag_and_drop_api/index.html @@ -1,6 +1,7 @@ --- title: DragDrop -slug: DragDrop +slug: conflicting/Web/API/HTML_Drag_and_Drop_API +original_slug: DragDrop --- <p> </p> diff --git a/files/ja/conflicting/web/api/index.html b/files/ja/conflicting/web/api/index.html index e069431e6e..d944a08a4d 100644 --- a/files/ja/conflicting/web/api/index.html +++ b/files/ja/conflicting/web/api/index.html @@ -1,8 +1,9 @@ --- title: element.name -slug: Web/API/Element/name +slug: conflicting/Web/API translation_of: Web/API translation_of_original: Web/API/Element/name +original_slug: Web/API/Element/name --- <p>{{ ApiRef() }}</p> <h3 class="editable" id="概要" style="margin-top: 0px; margin-right: 0px; margin-bottom: 0.8em; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; font-size: 1.142em; font-family: Georgia, Times, 'Times New Roman', serif; border-bottom-width: 1px; border-bottom-style: solid; color: rgb(51, 51, 51); font-style: normal; font-variant: normal; letter-spacing: normal; text-align: -webkit-auto; text-indent: 0px; text-transform: none; white-space: normal; background-color: rgb(255, 255, 255);"><span>概要</span></h3> diff --git a/files/ja/conflicting/web/api/mediastream_recording_api/index.html b/files/ja/conflicting/web/api/mediastream_recording_api/index.html index a2e3ec8eaf..16ca58a66e 100644 --- a/files/ja/conflicting/web/api/mediastream_recording_api/index.html +++ b/files/ja/conflicting/web/api/mediastream_recording_api/index.html @@ -1,8 +1,9 @@ --- title: MediaRecorder API -slug: Web/API/MediaRecorder_API +slug: conflicting/Web/API/MediaStream_Recording_API translation_of: Web/API/MediaStream_Recording_API translation_of_original: Web/API/MediaRecorder_API +original_slug: Web/API/MediaRecorder_API --- <div class="summary"> <p><span class="seoSummary">MediaRecorder API (MediaStream Recording) はインプットデバイスからのメディアストリームを記録するための API です。記録したストリームは PCM データのエンコードと言った操作をせずに利用できます。 {{ domxref("Navigator.getUserMedia()") }} を単体で利用する際の利用が想定されています。</span></p> diff --git a/files/ja/conflicting/web/api/mouseevent/button/index.html b/files/ja/conflicting/web/api/mouseevent/button/index.html index 572f611ebc..74d8e3fb44 100644 --- a/files/ja/conflicting/web/api/mouseevent/button/index.html +++ b/files/ja/conflicting/web/api/mouseevent/button/index.html @@ -1,12 +1,13 @@ --- title: event.button -slug: Web/API/Event/button +slug: conflicting/Web/API/MouseEvent/button tags: - DOM - Gecko - Gecko DOM Reference translation_of: Web/API/MouseEvent/button translation_of_original: Web/API/event.button +original_slug: Web/API/Event/button --- <p>{{ ApiRef() }}</p> <h3 id="Summary" name="Summary">Summary</h3> diff --git a/files/ja/conflicting/web/api/navigator/index.html b/files/ja/conflicting/web/api/navigator/index.html index 141fc19189..5232933f6c 100644 --- a/files/ja/conflicting/web/api/navigator/index.html +++ b/files/ja/conflicting/web/api/navigator/index.html @@ -1,8 +1,9 @@ --- title: navigator -slug: DOM_Client_Object_Cross-Reference/navigator +slug: conflicting/Web/API/Navigator translation_of: Web/API/Navigator translation_of_original: DOM_Client_Object_Cross-Reference/navigator +original_slug: DOM_Client_Object_Cross-Reference/navigator --- <p> </p> diff --git a/files/ja/conflicting/web/api/node/index.html b/files/ja/conflicting/web/api/node/index.html index 1de7600c48..400b03c03a 100644 --- a/files/ja/conflicting/web/api/node/index.html +++ b/files/ja/conflicting/web/api/node/index.html @@ -1,6 +1,6 @@ --- title: Node.baseURIObject -slug: Web/API/Node/baseURIObject +slug: conflicting/Web/API/Node tags: - DOM - DOM 3 @@ -8,6 +8,7 @@ tags: - Node translation_of: Web/API/Node translation_of_original: Web/API/Node/baseURIObject +original_slug: Web/API/Node/baseURIObject --- <div>{{ApiRef}} {{Fx_minversion_header("3")}} {{Non-standard_header}}</div> diff --git a/files/ja/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html b/files/ja/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html index 41547615f2..73fb9373a0 100644 --- a/files/ja/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html +++ b/files/ja/conflicting/web/api/node_378aed5ed6869e50853edbc988cf9556/index.html @@ -1,12 +1,13 @@ --- title: Node.nodePrincipal -slug: Web/API/Node/nodePrincipal +slug: conflicting/Web/API/Node_378aed5ed6869e50853edbc988cf9556 tags: - DOM - Gecko - Gecko DOM Reference translation_of: Web/API/Node translation_of_original: Web/API/Node/nodePrincipal +original_slug: Web/API/Node/nodePrincipal --- <div> {{ApiRef}}{{Fx_minversion_header("3")}}{{Non-standard_header}}</div> diff --git a/files/ja/conflicting/web/api/url/index.html b/files/ja/conflicting/web/api/url/index.html index ac758d1b3b..115cc981cf 100644 --- a/files/ja/conflicting/web/api/url/index.html +++ b/files/ja/conflicting/web/api/url/index.html @@ -1,6 +1,6 @@ --- title: window.URL -slug: Web/API/Window/URL +slug: conflicting/Web/API/URL tags: - API - DOM @@ -9,6 +9,7 @@ tags: - Window translation_of: Web/API/URL translation_of_original: Web/API/Window/URL +original_slug: Web/API/Window/URL --- <p>{{ApiRef("Window")}}{{SeeCompatTable}}</p> diff --git a/files/ja/conflicting/web/api/web_storage_api/index.html b/files/ja/conflicting/web/api/web_storage_api/index.html index 72c9a903e3..75846aa4cc 100644 --- a/files/ja/conflicting/web/api/web_storage_api/index.html +++ b/files/ja/conflicting/web/api/web_storage_api/index.html @@ -1,6 +1,6 @@ --- title: DOM Storage -slug: DOM/Storage +slug: conflicting/Web/API/Web_Storage_API tags: - DOM - Gecko @@ -10,5 +10,6 @@ tags: - 要更新 translation_of: Web/API/Web_Storage_API translation_of_original: Web/Guide/API/DOM/Storage +original_slug: DOM/Storage --- <p>REDIRECT <a href="https://developer.mozilla.org/ja/docs/Web/API/Web_Storage_API">Web Storage API</a></p> diff --git a/files/ja/conflicting/web/api/webgl_api/tutorial/using_textures_in_webgl/index.html b/files/ja/conflicting/web/api/webgl_api/tutorial/using_textures_in_webgl/index.html index 15dcbf30e3..22003539c0 100644 --- a/files/ja/conflicting/web/api/webgl_api/tutorial/using_textures_in_webgl/index.html +++ b/files/ja/conflicting/web/api/webgl_api/tutorial/using_textures_in_webgl/index.html @@ -1,8 +1,9 @@ --- title: Cross-Domain Textures -slug: Web/API/WebGL_API/Cross-Domain_Textures +slug: conflicting/Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL translation_of: Web/API/WebGL_API/Tutorial/Using_textures_in_WebGL#Cross-domain_textures translation_of_original: Web/API/WebGL_API/Cross-Domain_Textures +original_slug: Web/API/WebGL_API/Cross-Domain_Textures --- <p>WebGL のテクスチャの読み込みは、クロスドメインアクセス制御に従います。コンテンツで他のドメインからテクスチャを読み込むためには、CORS で許可を得る必要があります。CORS について詳しくは、<a href="/Ja/HTTP_access_control" title="ja/HTTP access control">HTTP access control</a> をご覧ください。</p> <p>CORS で許可された画像を WebGL のテクスチャとして使用する方法の説明を <a class="external" href="http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/" title="http://hacks.mozilla.org/2011/11/using-cors-to-load-webgl-textures-from-cross-domain-images/">こちらの hacks.mozilla.org の記事</a> に掲載していますので、<a class="external" href="http://people.mozilla.org/~bjacob/webgltexture-cors-js.html" title="http://people.mozilla.org/~bjacob/webgltexture-cors-js.html">サンプル</a> と合わせてご覧ください。</p> diff --git a/files/ja/conflicting/web/api/websockets_api/index.html b/files/ja/conflicting/web/api/websockets_api/index.html index d924ac2328..86a4664747 100644 --- a/files/ja/conflicting/web/api/websockets_api/index.html +++ b/files/ja/conflicting/web/api/websockets_api/index.html @@ -1,11 +1,12 @@ --- title: WebSockets リファレンス -slug: Web/API/WebSockets_API/WebSockets_reference +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> diff --git a/files/ja/conflicting/web/api/window/moveto/index.html b/files/ja/conflicting/web/api/window/moveto/index.html index 1510d2870e..0d540be728 100644 --- a/files/ja/conflicting/web/api/window/moveto/index.html +++ b/files/ja/conflicting/web/api/window/moveto/index.html @@ -1,8 +1,9 @@ --- title: Window.restore() -slug: Web/API/Window/restore +slug: conflicting/Web/API/Window/moveTo translation_of: Web/API/Window/moveTo translation_of_original: Web/API/Window/restore +original_slug: Web/API/Window/restore --- <p>{{APIRef}}</p> diff --git a/files/ja/conflicting/web/api/windoworworkerglobalscope/index.html b/files/ja/conflicting/web/api/windoworworkerglobalscope/index.html index 760541b9c5..798f2eaa85 100644 --- a/files/ja/conflicting/web/api/windoworworkerglobalscope/index.html +++ b/files/ja/conflicting/web/api/windoworworkerglobalscope/index.html @@ -1,10 +1,11 @@ --- title: WindowBase64 -slug: Web/API/WindowBase64 +slug: conflicting/Web/API/WindowOrWorkerGlobalScope tags: - API translation_of: Web/API/WindowOrWorkerGlobalScope translation_of_original: Web/API/WindowBase64 +original_slug: Web/API/WindowBase64 --- <p>{{APIRef("HTML DOM")}}</p> diff --git a/files/ja/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html b/files/ja/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html index 549969232f..bede3a0c57 100644 --- a/files/ja/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html +++ b/files/ja/conflicting/web/api/windoworworkerglobalscope_e2691f7ad05781a30c5fc5bb3b3f633a/index.html @@ -1,10 +1,11 @@ --- title: WindowTimers -slug: Web/API/WindowTimers +slug: conflicting/Web/API/WindowOrWorkerGlobalScope_e2691f7ad05781a30c5fc5bb3b3f633a tags: - API translation_of: Web/API/WindowOrWorkerGlobalScope translation_of_original: Web/API/WindowTimers +original_slug: Web/API/WindowTimers --- <div>{{APIRef("HTML DOM")}}</div> diff --git a/files/ja/conflicting/web/api/xsltprocessor/index.html b/files/ja/conflicting/web/api/xsltprocessor/index.html index ca2a707fb7..39a312dd4a 100644 --- a/files/ja/conflicting/web/api/xsltprocessor/index.html +++ b/files/ja/conflicting/web/api/xsltprocessor/index.html @@ -1,8 +1,9 @@ --- title: XSLTProcessor -slug: XSLTProcessor +slug: conflicting/Web/API/XSLTProcessor translation_of: Web/API/XSLTProcessor translation_of_original: XSLTProcessor +original_slug: XSLTProcessor --- <p>XSLTProcesor は、Mozilla の XSLT エンジンへのインタフェースを提供するオブジェクトです。特権のない JavaScript で利用可能です。</p> diff --git a/files/ja/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html b/files/ja/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html index 1df9691cb1..5be26b4aea 100644 --- a/files/ja/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html +++ b/files/ja/conflicting/web/api_dd04ca1265cb79b990b8120e5f5070d3/index.html @@ -1,6 +1,6 @@ --- title: WebAPI -slug: WebAPI +slug: conflicting/Web/API_dd04ca1265cb79b990b8120e5f5070d3 tags: - Apps - DOM @@ -8,6 +8,7 @@ tags: - Mobile translation_of: Web/API translation_of_original: WebAPI +original_slug: WebAPI --- <p><strong>WebAPI</strong> はデバイス間の互換性を提供する機能一式であり、Web アプリやコンテンツがデバイスに保存されているデータ (カレンダーや連絡先など) やデバイスハードウェア (バッテリーの状態やデバイスのバイブレーションハードウェアなど) へアクセスできるようにする API を指す用語です。これらの API を追加することにより今日の Web ができることを増やすとともに、従来はプロプライエタリなプラットフォームでしかできなかったことに広がることを望んでいます。</p> diff --git a/files/ja/conflicting/web/css/@media/index.html b/files/ja/conflicting/web/css/@media/index.html index 5bf2140f1d..54635c83da 100644 --- a/files/ja/conflicting/web/css/@media/index.html +++ b/files/ja/conflicting/web/css/@media/index.html @@ -1,5 +1,6 @@ --- title: Media -slug: Web/CSS/Media +slug: conflicting/Web/CSS/@media +original_slug: Web/CSS/Media --- {{wiki.localize('System.API.page-generated-for-subpage')}} diff --git a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html b/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html index 87ca6f864c..25382e211f 100644 --- a/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html +++ b/files/ja/conflicting/web/css/@media_dcb6ae28d731b140b24729ff941686e7/index.html @@ -1,6 +1,6 @@ --- title: Visual -slug: Web/CSS/Media/Visual +slug: conflicting/Web/CSS/@media_dcb6ae28d731b140b24729ff941686e7 tags: - CSS - CSS Reference @@ -8,6 +8,7 @@ tags: - NeedsContent translation_of: Web/CSS/@media translation_of_original: Web/CSS/media/visual +original_slug: Web/CSS/Media/Visual --- <div>{{ CSSRef() }}</div> <p><a href="/ja/CSS" title="ja/CSS">CSS</a> 標準で定義された<a href="/ja/CSS/@media#Media_groups" title="ja/CSS/@media#Media_groups">メディアグループ</a>。</p> diff --git a/files/ja/conflicting/web/css/@viewport/index.html b/files/ja/conflicting/web/css/@viewport/index.html index 38f093896b..d92f4f14dd 100644 --- a/files/ja/conflicting/web/css/@viewport/index.html +++ b/files/ja/conflicting/web/css/@viewport/index.html @@ -1,6 +1,6 @@ --- title: height -slug: Web/CSS/@viewport/height +slug: conflicting/Web/CSS/@viewport tags: - '@viewport' - At-rule descriptor @@ -9,6 +9,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/height +original_slug: Web/CSS/@viewport/height --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html b/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html index 0e9f9079f0..babd38fcfd 100644 --- a/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html +++ b/files/ja/conflicting/web/css/@viewport_516ab4b0283b5b2231fb657505e22440/index.html @@ -1,6 +1,6 @@ --- title: max-height -slug: Web/CSS/@viewport/max-height +slug: conflicting/Web/CSS/@viewport_516ab4b0283b5b2231fb657505e22440 tags: - '@viewport' - CSS @@ -8,6 +8,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/max-height +original_slug: Web/CSS/@viewport/max-height --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html b/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html index 01b0ae54b2..014def1f1b 100644 --- a/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html +++ b/files/ja/conflicting/web/css/@viewport_6e9c91ec34cdb0393d301240d0d50d84/index.html @@ -1,6 +1,6 @@ --- title: min-zoom -slug: Web/CSS/@viewport/min-zoom +slug: conflicting/Web/CSS/@viewport_6e9c91ec34cdb0393d301240d0d50d84 tags: - '@viewport' - CSS @@ -8,6 +8,7 @@ tags: - リファレンス translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/min-zoom +original_slug: Web/CSS/@viewport/min-zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html b/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html index 97814ca702..8b1161da9c 100644 --- a/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html +++ b/files/ja/conflicting/web/css/@viewport_a33ee59ffd8336ffb3336900dea02e9f/index.html @@ -1,6 +1,6 @@ --- title: viewport-fit -slug: Web/CSS/@viewport/viewport-fit +slug: conflicting/Web/CSS/@viewport_a33ee59ffd8336ffb3336900dea02e9f tags: - '@viewport' - CSS @@ -11,6 +11,7 @@ tags: - 画面レイアウト translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/viewport-fit +original_slug: Web/CSS/@viewport/viewport-fit --- <div>{{CSSRef}}{{Draft}}{{SeeCompatTable}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html b/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html index 483e5c214f..fc790794ae 100644 --- a/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html +++ b/files/ja/conflicting/web/css/@viewport_d03ebc763769680c55d1a4258592d3ed/index.html @@ -1,6 +1,6 @@ --- title: max-zoom -slug: Web/CSS/@viewport/max-zoom +slug: conflicting/Web/CSS/@viewport_d03ebc763769680c55d1a4258592d3ed tags: - '@viewport' - At-rule descriptor @@ -9,6 +9,7 @@ tags: - Reference translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/max-zoom +original_slug: Web/CSS/@viewport/max-zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html b/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html index f05447a501..19ee67e0fd 100644 --- a/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html +++ b/files/ja/conflicting/web/css/@viewport_e065ce90bde08c9679692adbe64f6518/index.html @@ -1,6 +1,6 @@ --- title: zoom -slug: Web/CSS/@viewport/zoom +slug: conflicting/Web/CSS/@viewport_e065ce90bde08c9679692adbe64f6518 tags: - '@viewport' - At-rule descriptor @@ -12,6 +12,7 @@ tags: - Web translation_of: Web/CSS/@viewport translation_of_original: Web/CSS/@viewport/zoom +original_slug: Web/CSS/@viewport/zoom --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html b/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html index f9e7367a09..f67b584d66 100644 --- a/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html +++ b/files/ja/conflicting/web/css/_colon_placeholder-shown/index.html @@ -1,12 +1,13 @@ --- title: ':-moz-placeholder' -slug: 'Web/CSS/:-moz-placeholder' +slug: conflicting/Web/CSS/:placeholder-shown tags: - CSS - CSS Reference - Non-standard -translation_of: 'Web/CSS/:placeholder-shown' -translation_of_original: 'Web/CSS/:-moz-placeholder' +translation_of: Web/CSS/:placeholder-shown +translation_of_original: Web/CSS/:-moz-placeholder +original_slug: Web/CSS/:-moz-placeholder --- <p>{{Non-standard_header}}{{ CSSRef() }}{{ gecko_minversion_header("2.0") }}</p> diff --git a/files/ja/conflicting/web/css/box-ordinal-group/index.html b/files/ja/conflicting/web/css/box-ordinal-group/index.html index 147bdbd9b4..121d6ea03f 100644 --- a/files/ja/conflicting/web/css/box-ordinal-group/index.html +++ b/files/ja/conflicting/web/css/box-ordinal-group/index.html @@ -1,6 +1,6 @@ --- title: '-moz-box-ordinal-group' -slug: Web/CSS/-moz-box-ordinal-group +slug: conflicting/Web/CSS/box-ordinal-group tags: - CSS - Mozilla 拡張 @@ -9,6 +9,7 @@ tags: - フレックスボックス translation_of: Web/CSS/box-ordinal-group translation_of_original: Web/CSS/-moz-box-ordinal-group +original_slug: Web/CSS/-moz-box-ordinal-group --- <p>{{CSSRef}}{{warning("これは CSS フレックスボックスレイアウトモジュールの初期の草稿にあったプロパティであり、その後の草稿で置き換えられました。")}}</p> diff --git a/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html b/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html index fa7ce58677..f977767419 100644 --- a/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html +++ b/files/ja/conflicting/web/css/css_backgrounds_and_borders/resizing_background_images/index.html @@ -1,8 +1,9 @@ --- title: 背景画像の拡大縮小 -slug: Web/CSS/Scaling_background_images +slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images translation_of_original: Web/CSS/CSS_Background_and_Borders/Scaling_background_images +original_slug: Web/CSS/Scaling_background_images --- <p>CSS の {{cssxref("background-size")}} プロパティによって、フルサイズの画像がタイル状に配置されるという既定の動作の代わりに、背景画像のサイズを調節することができるようになります。画像を望むように拡大または縮小することができます。</p> diff --git a/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html b/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html index 4c7327f6c1..863b8661e9 100644 --- a/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html +++ b/files/ja/conflicting/web/css/css_backgrounds_and_borders/using_multiple_backgrounds/index.html @@ -1,6 +1,6 @@ --- title: CSS での複数の背景の利用方法 -slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds +slug: conflicting/Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds tags: - CSS - CSS Background @@ -9,6 +9,7 @@ tags: - Intermediate translation_of: Web/CSS/CSS_Backgrounds_and_Borders/Using_multiple_backgrounds translation_of_original: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds +original_slug: Web/CSS/CSS_Background_and_Borders/Using_CSS_multiple_backgrounds --- <p id="Summary">{{CSSRef}}</p> diff --git a/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html b/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html index fc56bb1de6..6e0d6f11fe 100644 --- a/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html +++ b/files/ja/conflicting/web/css/css_basic_user_interface/using_url_values_for_the_cursor_property/index.html @@ -1,11 +1,13 @@ --- title: cursor のプロパティーに URL 値を使用する -slug: Using_URL_values_for_the_cursor_property +slug: >- + conflicting/Web/CSS/CSS_Basic_User_Interface/Using_URL_values_for_the_cursor_property tags: - CSS - CSS_2.1 - Cross-browser_Development - Web Development +original_slug: Using_URL_values_for_the_cursor_property --- <p> </p> <p><a href="ja/Gecko">Gecko</a> 1.8 (<a href="ja/Firefox_1.5">Firefox 1.5</a>, SeaMonkey 1.0) では、<a class="external" href="http://www.w3.org/TR/CSS21/ui.html#cursor-props">CSS2 cursor プロパティー</a> で URL 値が使用できます。これにより、自由な画像 — Gecko がサポートする画像形式なら — がマウスカーソルとして利用できます。</p> diff --git a/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html b/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html index 42426babe4..7fa1a3b2d7 100644 --- a/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html +++ b/files/ja/conflicting/web/css/css_flexible_box_layout/backwards_compatibility_of_flexbox/index.html @@ -1,12 +1,13 @@ --- title: クロスブラウザのフレックスボックスのミックスイン -slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins +slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox tags: - CSS - CSS フレックスボックス - ミックスイン - リファレンス translation_of: Web/CSS/CSS_Flexible_Box_Layout/Mixins +original_slug: Web/CSS/CSS_Flexible_Box_Layout/Mixins --- <div>{{cssref}}</div> diff --git a/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html b/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html index 4458dddff2..8f7ad0278f 100644 --- a/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html +++ b/files/ja/conflicting/web/css/css_flexible_box_layout/typical_use_cases_of_flexbox/index.html @@ -1,6 +1,6 @@ --- title: Web アプリケーションのレイアウトに flexbox を使用する -slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications +slug: conflicting/Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox tags: - Advanced - CSS @@ -10,6 +10,7 @@ tags: - Web translation_of: Web/CSS/CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox translation_of_original: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications +original_slug: Web/CSS/CSS_Flexible_Box_Layout/Using_flexbox_to_lay_out_web_applications --- <div>{{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/float/index.html b/files/ja/conflicting/web/css/float/index.html index 562347725e..bf8bb57433 100644 --- a/files/ja/conflicting/web/css/float/index.html +++ b/files/ja/conflicting/web/css/float/index.html @@ -1,11 +1,12 @@ --- title: none -slug: Web/CSS/none +slug: conflicting/Web/CSS/float tags: - CSS - CSS Reference translation_of: Web/CSS/float translation_of_original: Web/CSS/none +original_slug: Web/CSS/none --- <div> {{CSSRef()}}</div> diff --git a/files/ja/conflicting/web/css/font-variant/index.html b/files/ja/conflicting/web/css/font-variant/index.html index 4f1a3acf6b..d0b2e6859e 100644 --- a/files/ja/conflicting/web/css/font-variant/index.html +++ b/files/ja/conflicting/web/css/font-variant/index.html @@ -1,10 +1,11 @@ --- title: normal -slug: Web/CSS/normal +slug: conflicting/Web/CSS/font-variant tags: - CSS Reference translation_of: Web/CSS/font-variant translation_of_original: Web/CSS/normal +original_slug: Web/CSS/normal --- <div> {{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/index.html b/files/ja/conflicting/web/css/index.html index 7eed5bdf59..3b505b86f1 100644 --- a/files/ja/conflicting/web/css/index.html +++ b/files/ja/conflicting/web/css/index.html @@ -1,12 +1,13 @@ --- title: CSS-2 Quick Reference -slug: CSS-2_Quick_Reference +slug: conflicting/Web/CSS tags: - CSS - CSS2_Quick_Reference - CSS_2.1 translation_of: Web/CSS translation_of_original: CSS-2_Quick_Reference +original_slug: CSS-2_Quick_Reference --- <p> </p><p>この文書は、初心者からエキスパートまでのための CSS-2 仕様のクイックリファレンスです。スタイルプロパティは簡単な文法で書かれています。 </p><p><big><b><a href="ja/CSS-2_Quick_Reference/All_in_a_page">CSS-2 クイックリファレンス(一括)</a></b></big> diff --git a/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html index 961536b070..6061a96fe2 100644 --- a/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html +++ b/files/ja/conflicting/web/css/media_queries/using_media_queries/index.html @@ -1,9 +1,10 @@ --- title: メディアクエリ -slug: Web/Guide/CSS/Media_queries +slug: conflicting/Web/CSS/Media_Queries/Using_media_queries tags: - CSS - CSS Reference +original_slug: Web/Guide/CSS/Media_queries --- <p>{{ gecko_minversion_header("1.9.1") }}</p> diff --git a/files/ja/conflicting/web/css/reference/index.html b/files/ja/conflicting/web/css/reference/index.html index 9d20688007..895d608fb9 100644 --- a/files/ja/conflicting/web/css/reference/index.html +++ b/files/ja/conflicting/web/css/reference/index.html @@ -1,12 +1,13 @@ --- title: All in a page -slug: CSS-2_Quick_Reference/All_in_a_page +slug: conflicting/Web/CSS/Reference tags: - CSS - CSS2_Quick_Reference - CSS_2.1 translation_of: Web/CSS/Reference translation_of_original: CSS-2_Quick_Reference/All_in_a_page +original_slug: CSS-2_Quick_Reference/All_in_a_page --- <p> </p><p>この文書は、初心者からエキスパートまでのための CSS-2 仕様のクイックリファレンスです。スタイルプロパティは簡単な文法で書かれています。 diff --git a/files/ja/conflicting/web/css/url()/index.html b/files/ja/conflicting/web/css/url()/index.html index 2ca334be5a..482b13773d 100644 --- a/files/ja/conflicting/web/css/url()/index.html +++ b/files/ja/conflicting/web/css/url()/index.html @@ -1,6 +1,6 @@ --- title: <url> -slug: Web/CSS/url +slug: conflicting/Web/CSS/url() tags: - CSS - CSS データ型 @@ -11,6 +11,7 @@ tags: - レイアウト translation_of: Web/CSS/url() translation_of_original: Web/CSS/url +original_slug: Web/CSS/url --- <div>{{CssRef}}</div> diff --git a/files/ja/conflicting/web/css/width/index.html b/files/ja/conflicting/web/css/width/index.html index cae634e45a..4acaea3400 100644 --- a/files/ja/conflicting/web/css/width/index.html +++ b/files/ja/conflicting/web/css/width/index.html @@ -1,11 +1,12 @@ --- title: auto -slug: Web/CSS/auto +slug: conflicting/Web/CSS/width tags: - CSS - CSS Reference translation_of: Web/CSS/width translation_of_original: Web/CSS/auto +original_slug: Web/CSS/auto --- <div> {{CSSRef}}</div> diff --git a/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html b/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html index aad9d6d606..7f5df2ea39 100644 --- a/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html +++ b/files/ja/conflicting/web/css/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc/index.html @@ -1,10 +1,11 @@ --- title: width -slug: width +slug: conflicting/Web/CSS/width_eaae26a6fb20ed3ef54fb23bfa0b1fcc tags: - Disambiguation translation_of: Web/CSS/width translation_of_original: width +original_slug: width --- <p><code>width</code> は多くの文脈で用いられます。</p> diff --git a/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html b/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html index fe471649c2..c3f2335ad4 100644 --- a/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html +++ b/files/ja/conflicting/web/css_eb0c7d23f84df658710ebb6b4bdec8ea/index.html @@ -1,10 +1,11 @@ --- title: Other Resources -slug: Web/CSS/Other_Resources +slug: conflicting/Web/CSS_eb0c7d23f84df658710ebb6b4bdec8ea tags: - CSS translation_of: Web/CSS translation_of_original: Web/CSS/Other_Resources +original_slug: Web/CSS/Other_Resources --- <h2 id="W3C_Documents" name="W3C_Documents">W3C の文書</h2> <ul> diff --git a/files/ja/conflicting/web/guide/events/creating_and_triggering_events/index.html b/files/ja/conflicting/web/guide/events/creating_and_triggering_events/index.html index a544b714ed..cabf4007c9 100644 --- a/files/ja/conflicting/web/guide/events/creating_and_triggering_events/index.html +++ b/files/ja/conflicting/web/guide/events/creating_and_triggering_events/index.html @@ -1,12 +1,13 @@ --- title: dispatchEvent example -slug: DOM/dispatchEvent_example +slug: conflicting/Web/Guide/Events/Creating_and_triggering_events tags: - DOM - Gecko - Gecko DOM Reference translation_of: Web/Guide/Events/Creating_and_triggering_events translation_of_original: Web/Guide/Events/Event_dispatching_example +original_slug: DOM/dispatchEvent_example --- <div class="noinclude"> {{ApiRef}}</div> diff --git a/files/ja/conflicting/web/guide/index.html b/files/ja/conflicting/web/guide/index.html index 534c441e19..d6009537a7 100644 --- a/files/ja/conflicting/web/guide/index.html +++ b/files/ja/conflicting/web/guide/index.html @@ -1,10 +1,11 @@ --- title: Web 開発 -slug: Web_Development +slug: conflicting/Web/Guide tags: - Web Development translation_of: Web/Guide translation_of_original: Web_Development +original_slug: Web_Development --- <p><strong>ウェブ開発</strong> は、ウェブサイトやウェブアプリケーションの開発のすべての側面を含んでいます。</p> diff --git a/files/ja/conflicting/web/guide/introduction_to_web_development/index.html b/files/ja/conflicting/web/guide/introduction_to_web_development/index.html index 73086c9207..cb5da75bbc 100644 --- a/files/ja/conflicting/web/guide/introduction_to_web_development/index.html +++ b/files/ja/conflicting/web/guide/introduction_to_web_development/index.html @@ -1,6 +1,7 @@ --- title: Introduction to Web development -slug: Web_Development/Introduction_to_Web_development +slug: conflicting/Web/Guide/Introduction_to_Web_development +original_slug: Web_Development/Introduction_to_Web_development --- <p>Web開発の初歩</p> diff --git a/files/ja/conflicting/web/guide/mobile/index.html b/files/ja/conflicting/web/guide/mobile/index.html index cc288a9c45..028d0c71ed 100644 --- a/files/ja/conflicting/web/guide/mobile/index.html +++ b/files/ja/conflicting/web/guide/mobile/index.html @@ -1,6 +1,6 @@ --- title: Mobile Web development -slug: Web_Development/Mobile +slug: conflicting/Web/Guide/Mobile tags: - Mobile - NeedsTranslation @@ -8,6 +8,7 @@ tags: - Web Development translation_of: Web/Guide/Mobile translation_of_original: Web_Development/Mobile +original_slug: Web_Development/Mobile --- <p>Developing web sites to be viewed on mobile devices requires approaches that ensure a web site works as well on mobile devices as it does on desktop browsers. The following articles describe some of these approaches.</p> <ul> diff --git a/files/ja/conflicting/web/html/element/index.html b/files/ja/conflicting/web/html/element/index.html index b5da7466db..68508196e4 100644 --- a/files/ja/conflicting/web/html/element/index.html +++ b/files/ja/conflicting/web/html/element/index.html @@ -1,11 +1,12 @@ --- title: HTML5 の要素 -slug: Web/Guide/HTML/HTML5/HTML5_element_list +slug: conflicting/Web/HTML/Element tags: - HTML - HTML5 translation_of: Web/HTML/Element translation_of_original: Web/Guide/HTML/HTML5/HTML5_element_list +original_slug: Web/Guide/HTML/HTML5/HTML5_element_list --- <p>This page list all <strong>standard HTML5 elements</strong>, described by their opening tag and grouped by function. Contrary to the <a href="/ja/docs/HTML/Element" title="HTML/Element">HTML Element index</a> which lists all possible tags, standard, non-standard, valid, obsolete or deprecated ones, this list only the valid HTML5 elements. Only those should be used in new Web sites.</p> diff --git a/files/ja/conflicting/web/html/element/title/index.html b/files/ja/conflicting/web/html/element/title/index.html index ab170f7d35..ba4997c37b 100644 --- a/files/ja/conflicting/web/html/element/title/index.html +++ b/files/ja/conflicting/web/html/element/title/index.html @@ -1,10 +1,11 @@ --- title: title -slug: title +slug: conflicting/Web/HTML/Element/title tags: - Disambiguation translation_of: Web/HTML/Element/title translation_of_original: title +original_slug: title --- <p><strong>title</strong> は、その文脈により異なるものを指す場合があります。</p> diff --git a/files/ja/conflicting/web/html/global_attributes/index.html b/files/ja/conflicting/web/html/global_attributes/index.html index aee67a75d0..07afbb6206 100644 --- a/files/ja/conflicting/web/html/global_attributes/index.html +++ b/files/ja/conflicting/web/html/global_attributes/index.html @@ -1,6 +1,6 @@ --- title: Global attribute (グローバル属性) -slug: Glossary/Global_attribute +slug: conflicting/Web/HTML/Global_attributes tags: - Attribute - CodingScripting @@ -8,6 +8,7 @@ tags: - HTML translation_of: Web/HTML/Global_attributes translation_of_original: Glossary/Global_attribute +original_slug: Glossary/Global_attribute --- <p>グローバル属性は、すべての{{glossary("element","要素")}}で使用できる{{glossary("attribute","属性")}}です（ただし、一部の要素には影響を与えないこともあります）。</p> diff --git a/files/ja/conflicting/web/html/global_attributes/spellcheck/index.html b/files/ja/conflicting/web/html/global_attributes/spellcheck/index.html index 07cdb135ef..35350b2aa5 100644 --- a/files/ja/conflicting/web/html/global_attributes/spellcheck/index.html +++ b/files/ja/conflicting/web/html/global_attributes/spellcheck/index.html @@ -1,9 +1,10 @@ --- title: HTML フォームのスペルチェックを制御する -slug: Controlling_spell_checking_in_HTML_forms +slug: conflicting/Web/HTML/Global_attributes/spellcheck tags: - Configuration management - HTML +original_slug: Controlling_spell_checking_in_HTML_forms --- <p>{{ Fx_minversion_header(2) }} Firefox 2 はウェブフォームのテキストエリア{{ 訳注("複数行のテキスト入力欄") }}とテキストフィールド{{ 訳注("一行のテキスト入力欄") }}のスペルチェックのサポートを導入します。ユーザーは about:config インターフェースを使って、スペルチェックを有効にするか、テキストエリアとテキストフィールドの両方でチェックするかを設定することができます。</p> <p>標準では、テキストエリアと <code>designMode</code> ドキュメントではスペルチェックが行われますが、一行の入力ボックスでは行われません。なぜなら、Firefox が ユーザ ID や E メールアドレスを誤ってマークしてしまうと、ユーザの気を散らしてしまうからです。</p> diff --git a/files/ja/conflicting/web/http/connection_management_in_http_1.x/index.html b/files/ja/conflicting/web/http/connection_management_in_http_1.x/index.html index adb8b20a69..cfb98c2888 100644 --- a/files/ja/conflicting/web/http/connection_management_in_http_1.x/index.html +++ b/files/ja/conflicting/web/http/connection_management_in_http_1.x/index.html @@ -1,10 +1,11 @@ --- title: HTTP Pipelining FAQ -slug: HTTP_Pipelining_FAQ +slug: conflicting/Web/HTTP/Connection_management_in_HTTP_1.x tags: - Necko translation_of: Web/HTTP/Connection_management_in_HTTP_1.x translation_of_original: Web/HTTP/Pipelining_FAQ +original_slug: HTTP_Pipelining_FAQ --- <p><b>HTTP/1.1 パイプライン化 FAQ</b> </p> diff --git a/files/ja/conflicting/web/http/headers/user-agent/firefox/index.html b/files/ja/conflicting/web/http/headers/user-agent/firefox/index.html index c14a549f89..2ab120d90f 100644 --- a/files/ja/conflicting/web/http/headers/user-agent/firefox/index.html +++ b/files/ja/conflicting/web/http/headers/user-agent/firefox/index.html @@ -1,10 +1,11 @@ --- title: User Agent Strings Reference -slug: User_Agent_Strings_Reference +slug: conflicting/Web/HTTP/Headers/User-Agent/Firefox tags: - 要更新 translation_of: Web/HTTP/Headers/User-Agent/Firefox translation_of_original: User_Agent_Strings_Reference +original_slug: User_Agent_Strings_Reference --- <h3 id="このドキュメントの状況"><a name="status">このドキュメントの状況</a></h3> <p>これは、元の user-agent のバージョン文字列提議の改訂版です。<a class="external" href="http://www-archive.mozilla.org/build/user-agent-strings.html">元の、時代遅れの提議</a> と、<a class="link-news" href="news://news.mozilla.org/netscape.public.mozilla.seamonkey">netscape.public.mozilla.seamonkey</a> 及び <a class="link-news" href="news://news.mozilla.org/netscape.public.mozilla.netlib">netscape.public.mozilla.netlib</a>での議論を改訂の参考にしてください。</p> diff --git a/files/ja/conflicting/web/http/headers/x-dns-prefetch-control/index.html b/files/ja/conflicting/web/http/headers/x-dns-prefetch-control/index.html index f6ef54e17d..77bc5a83be 100644 --- a/files/ja/conflicting/web/http/headers/x-dns-prefetch-control/index.html +++ b/files/ja/conflicting/web/http/headers/x-dns-prefetch-control/index.html @@ -1,6 +1,7 @@ --- title: DNS プリフェッチの制御 -slug: Controlling_DNS_prefetching +slug: conflicting/Web/HTTP/Headers/X-DNS-Prefetch-Control +original_slug: Controlling_DNS_prefetching --- <p>{{ fx_minversion_header(3.5) }}</p> <p>Firefox 3.5 では <strong>DNS prefetching </strong>が導入されました。これにより、 Firefox は文書中に埋め込まれたアンカーに加え、画像、CSS、JavaScript などの文書内で参照されている外部リソースの URL に対し、予めドメインの名前解決を行います。</p> diff --git a/files/ja/conflicting/web/javascript/guide/index.html b/files/ja/conflicting/web/javascript/guide/index.html index 79c30b670a..6de176b7ab 100644 --- a/files/ja/conflicting/web/javascript/guide/index.html +++ b/files/ja/conflicting/web/javascript/guide/index.html @@ -1,6 +1,7 @@ --- title: Function Object -slug: Web/JavaScript/Guide/Obsolete_Pages/Predefined_Core_Objects/Function_Object +slug: conflicting/Web/JavaScript/Guide +original_slug: Web/JavaScript/Guide/Obsolete_Pages/Predefined_Core_Objects/Function_Object --- <p> </p> <h3 id="Function_.E3.82.AA.E3.83.96.E3.82.B8.E3.82.A7.E3.82.AF.E3.83.88" name="Function_.E3.82.AA.E3.83.96.E3.82.B8.E3.82.A7.E3.82.AF.E3.83.88">Function オブジェクト</h3> diff --git a/files/ja/conflicting/web/javascript/guide_552be6201ec831852573aad295c96538/index.html b/files/ja/conflicting/web/javascript/guide_552be6201ec831852573aad295c96538/index.html index 88bf9acbe7..c058e41066 100644 --- a/files/ja/conflicting/web/javascript/guide_552be6201ec831852573aad295c96538/index.html +++ b/files/ja/conflicting/web/javascript/guide_552be6201ec831852573aad295c96538/index.html @@ -1,8 +1,9 @@ --- title: Obsolete Pages -slug: Web/JavaScript/Guide/Obsolete_Pages +slug: conflicting/Web/JavaScript/Guide_552be6201ec831852573aad295c96538 translation_of: Web/JavaScript/Guide translation_of_original: Web/JavaScript/Guide/Obsolete_Pages +original_slug: Web/JavaScript/Guide/Obsolete_Pages --- <p>This is a list of pages that have been merged into chapters (in alphabetical order):</p> 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> diff --git a/files/ja/conflicting/web/opensearch/index.html b/files/ja/conflicting/web/opensearch/index.html index f7c679aae4..f914e87c1c 100644 --- a/files/ja/conflicting/web/opensearch/index.html +++ b/files/ja/conflicting/web/opensearch/index.html @@ -1,11 +1,12 @@ --- title: ウェブページからの検索エンジンの追加 -slug: Adding_search_engines_from_web_pages +slug: conflicting/Web/OpenSearch tags: - Add-ons - Search plugins translation_of: Web/OpenSearch translation_of_original: Web/API/Window/sidebar/Adding_search_engines_from_Web_pages +original_slug: Adding_search_engines_from_web_pages --- <p>Firefox では JavaScript コードから検索プラグインをインストールすることができ、<a href="ja/Creating_OpenSearch_plugins_for_Firefox">OpenSearch</a> と Sherlock という 2 つの検索プラグインフォーマットをサポートしています。</p> diff --git a/files/ja/conflicting/web/progressive_web_apps/index.html b/files/ja/conflicting/web/progressive_web_apps/index.html index 36724f3ba5..c0c8560dda 100644 --- a/files/ja/conflicting/web/progressive_web_apps/index.html +++ b/files/ja/conflicting/web/progressive_web_apps/index.html @@ -1,6 +1,6 @@ --- title: レスポンシブデザイン -slug: Web_Development/Mobile/Responsive_design +slug: conflicting/Web/Progressive_web_apps tags: - Apps - Mobile @@ -8,6 +8,7 @@ tags: - Web Development translation_of: Web/Progressive_web_apps translation_of_original: Web/Guide/Responsive_design +original_slug: Web_Development/Mobile/Responsive_design --- <p>モバイル向けとデスクトップ向けの Web サイトの開発に対する <a href="/ja/docs/Web/Guide/Mobile/Separate_sites" title="Web development/Mobile/Separate sites">別々のサイト</a> 手法に関連する問題に対する反応として、比較的新しい (実際は <a href="http://www.alistapart.com/articles/dao/">とても古い</a>) アイディアが人気を集め始めています。ユーザーエージェントでの判別とは別れを告げ、かわりにクライアント側のブラウザの機能でページを対応させましょう。この手法は Ethan Marcotte のブログ記事 <a href="http://alistapart.com" title="http://alistapart.com">A List Apart</a> で紹介され、<a href="http://www.alistapart.com/articles/responsive-web-design/" style="line-height: 1.572;">レスポンシブ Web デザイン</a> として知られるようになりました。分離したサイト開発手法と同様に、レスポンシブ Web デザインにも短所があります。</p> diff --git a/files/ja/conflicting/web/progressive_web_apps/introduction/index.html b/files/ja/conflicting/web/progressive_web_apps/introduction/index.html index b7d3a2dc7b..fbe530de46 100644 --- a/files/ja/conflicting/web/progressive_web_apps/introduction/index.html +++ b/files/ja/conflicting/web/progressive_web_apps/introduction/index.html @@ -1,6 +1,6 @@ --- title: プログレッシブウェブアプリの利点 -slug: Web/Progressive_web_apps/Advantages +slug: conflicting/Web/Progressive_web_apps/Introduction tags: - PWA - Progressive web apps @@ -8,6 +8,7 @@ tags: - concepts translation_of: Web/Progressive_web_apps/Introduction#Advantages_of_web_applications translation_of_original: Web/Progressive_web_apps/Advantages +original_slug: Web/Progressive_web_apps/Advantages --- <p class="summary"><span class="seoSummary">プログレッシブウェブアプリ（Progressive web apps、PWA）には、以下のセクションにリストされているすべての利点があります。</span></p> diff --git a/files/ja/conflicting/web/svg/svg_1.1_support_in_firefox/index.html b/files/ja/conflicting/web/svg/svg_1.1_support_in_firefox/index.html index 8def32aa25..486a4831bc 100644 --- a/files/ja/conflicting/web/svg/svg_1.1_support_in_firefox/index.html +++ b/files/ja/conflicting/web/svg/svg_1.1_support_in_firefox/index.html @@ -1,10 +1,11 @@ --- title: Firefox の SVG 実装状況 -slug: SVG_in_Firefox +slug: conflicting/Web/SVG/SVG_1.1_Support_in_Firefox tags: - Firefox - SVG translation_of: Web/SVG/SVG_1.1_Support_in_Firefox +original_slug: SVG_in_Firefox --- <p><a class="external" href="http://www.w3.org/Graphics/SVG/Test/20061213/">W3C SVG test suite</a> に、いくつかの基本的な SVG 構文と使用例があります。</p> <div class="geckoVersionNote"> diff --git a/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html b/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html index 8d63ce70da..7b1bbbfe5a 100644 --- a/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html +++ b/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript/index.html @@ -1,7 +1,8 @@ --- title: JavaScript で XPath を使用する -slug: Web/JavaScript/Introduction_to_using_XPath_in_JavaScript +slug: conflicting/Web/XPath/Introduction_to_using_XPath_in_JavaScript translation_of: Web/XPath/Introduction_to_using_XPath_in_JavaScript +original_slug: Web/JavaScript/Introduction_to_using_XPath_in_JavaScript --- <p>このドキュメントでは、JavaScript の内部、拡張機能、そして Web サイトから <a href="/ja/docs/Web/XPath">XPath</a> を使用するためのインターフェイスについて説明します。Mozilla は <a class="external" href="https://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226/">DOM 3 XPath</a> をかなりの量実装しており、XPath 式は HTML と XML ドキュメントの両方に対して実行できます。</p> diff --git a/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript_caa7dfd0899fa1d0dfa5b1eb32e49ac7/index.html b/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript_caa7dfd0899fa1d0dfa5b1eb32e49ac7/index.html index 9186a55b76..1c3ebc7ca6 100644 --- a/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript_caa7dfd0899fa1d0dfa5b1eb32e49ac7/index.html +++ b/files/ja/conflicting/web/xpath/introduction_to_using_xpath_in_javascript_caa7dfd0899fa1d0dfa5b1eb32e49ac7/index.html @@ -1,6 +1,7 @@ --- title: Using XPath -slug: Using_XPath +slug: >- + conflicting/Web/XPath/Introduction_to_using_XPath_in_JavaScript_caa7dfd0899fa1d0dfa5b1eb32e49ac7 tags: - AJAX - Add-ons @@ -12,6 +13,7 @@ tags: - XSLT translation_of: Web/XPath/Introduction_to_using_XPath_in_JavaScript translation_of_original: Using_XPath +original_slug: Using_XPath --- <p> </p><p><a href="ja/XPath">XPath</a> は XML 文書の一部を指し示すための言語であり、<a class="external" href="http://www.w3.org/TR/xpath">W3C 勧告</a>です。 |