From edcbfa42307307b620944e0aa4f6125d47e811eb Mon Sep 17 00:00:00 2001 From: Masahiro FUJIMOTO Date: Fri, 25 Jun 2021 01:34:02 +0900 Subject: Web/API/Canvas_API/Tutorial を更新 (conflicting と統合) (#1207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - conflicting 版の方が原文に近かったので、こちらを正規版に置き換え - Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d は内容が古く、他の記事でカバーされていると考えられるため削除 - 履歴とリダイレクトを修正 --- files/ja/_redirects.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'files/ja/_redirects.txt') diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt index 3f3d394e3e..26087d87d6 100644 --- a/files/ja/_redirects.txt +++ b/files/ja/_redirects.txt @@ -2265,7 +2265,7 @@ /ja/docs/DragDrop/Dragging_and_Dropping_Multiple_Items /ja/docs/Web/API/HTML_Drag_and_Drop_API/Multiple_items /ja/docs/DragDrop/Recommended_Drag_Types /ja/docs/Web/API/HTML_Drag_and_Drop_API/Recommended_drag_types /ja/docs/DragDrop/ドラッグ&ドロップ /ja/docs/Web/API/HTML_Drag_and_Drop_API -/ja/docs/Drawing_Graphics_with_Canvas /ja/docs/conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d +/ja/docs/Drawing_Graphics_with_Canvas /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Drawing_text_using_a_canvas /ja/docs/Web/API/Canvas_API/Tutorial/Drawing_text /ja/docs/Dynamically_modifying_XUL-based_user_interface /ja/docs/orphaned/Dynamically_modifying_XUL-based_user_interface /ja/docs/E4X/Processing_XML_with_E4X /ja/docs/orphaned/E4X/Processing_XML_with_E4X @@ -2389,7 +2389,7 @@ /ja/docs/HTML/Block-level_elements /ja/docs/Web/HTML/Block-level_elements /ja/docs/HTML/CORS_settings_attributes /ja/docs/Web/HTML/Attributes/crossorigin /ja/docs/HTML/Canvas /ja/docs/Web/API/Canvas_API -/ja/docs/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d +/ja/docs/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/HTML/Canvas/Tutorial /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/HTML/Content_Editable /ja/docs/Web/Guide/HTML/Editable_content /ja/docs/HTML/Content_categories /ja/docs/Web/Guide/HTML/Content_categories @@ -3725,7 +3725,7 @@ /ja/docs/Web/API/CanvasRenderingContext2D.clearHitRegions /ja/docs/Web/API/CanvasRenderingContext2D/clearHitRegions /ja/docs/Web/API/CanvasRenderingContext2D.drawFocusIfNeeded /ja/docs/Web/API/CanvasRenderingContext2D/drawFocusIfNeeded /ja/docs/Web/API/CanvasRenderingContext2D.removeHitRegion /ja/docs/Web/API/CanvasRenderingContext2D/removeHitRegion -/ja/docs/Web/API/Canvas_API/Drawing_graphics_with_canvas /ja/docs/conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d +/ja/docs/Web/API/Canvas_API/Drawing_graphics_with_canvas /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Web/API/ChildNode/remove /ja/docs/orphaned/Web/API/ChildNode/remove /ja/docs/Web/API/ChildNode/replaceWith /ja/docs/orphaned/Web/API/ChildNode/replaceWith /ja/docs/Web/API/Console.error /ja/docs/Web/API/Console/error @@ -4600,9 +4600,9 @@ /ja/docs/Web/Guide/Events/Event_handlers /ja/docs/orphaned/Web/Guide/Events/Event_handlers /ja/docs/Web/Guide/Events/Orientation_and_motion_data_explained /ja/docs/Web/Events/Orientation_and_motion_data_explained /ja/docs/Web/Guide/Events/Overview_of_Events_and_Handlers /ja/docs/orphaned/Web/Guide/Events/Overview_of_Events_and_Handlers -/ja/docs/Web/Guide/Graphics/Drawing_graphics_with_canvas /ja/docs/conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d +/ja/docs/Web/Guide/Graphics/Drawing_graphics_with_canvas /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Web/Guide/HTML /ja/docs/Learn/HTML -/ja/docs/Web/Guide/HTML/Canvas_tutorial /ja/docs/conflicting/Web/API/Canvas_API/Tutorial +/ja/docs/Web/Guide/HTML/Canvas_tutorial /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Web/Guide/HTML/Canvas_tutorial/Advanced_animations /ja/docs/Web/API/Canvas_API/Tutorial/Advanced_animations /ja/docs/Web/Guide/HTML/Canvas_tutorial/Applying_styles_and_colors /ja/docs/Web/API/Canvas_API/Tutorial/Applying_styles_and_colors /ja/docs/Web/Guide/HTML/Canvas_tutorial/Basic_animations /ja/docs/Web/API/Canvas_API/Tutorial/Basic_animations @@ -4642,7 +4642,7 @@ /ja/docs/Web/Guide/Using_FormData_Objects /ja/docs/conflicting/Web/API/FormData/Using_FormData_Objects /ja/docs/Web/HTML/CORS_settings_attributes /ja/docs/Web/HTML/Attributes/crossorigin /ja/docs/Web/HTML/Canvas /ja/docs/Web/API/Canvas_API -/ja/docs/Web/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/conflicting/Web/API/Canvas_API/Tutorial_3cd5468edc15a1ef1ddc0d2b17e1fa5d +/ja/docs/Web/HTML/Canvas/Drawing_Graphics_with_Canvas /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Web/HTML/Canvas/Tutorial /ja/docs/Web/API/Canvas_API/Tutorial /ja/docs/Web/HTML/Content_Editable /ja/docs/Web/Guide/HTML/Editable_content /ja/docs/Web/HTML/Content_Editable/Rich-Text_Editing_in_Mozilla /ja/docs/Web/Guide/HTML/Editable_content/Rich-Text_Editing_in_Mozilla -- cgit v1.2.3-54-g00ecf