aboutsummaryrefslogtreecommitdiff
path: root/files/zh-cn/conflicting/learn/html
diff options
context:
space:
mode:
Diffstat (limited to 'files/zh-cn/conflicting/learn/html')
-rw-r--r--files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html3
-rw-r--r--files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html b/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
index fd51ef502f..81d56d0055 100644
--- a/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
+++ b/files/zh-cn/conflicting/learn/html/introduction_to_html/creating_hyperlinks/index.html
@@ -1,6 +1,6 @@
---
title: Email links
-slug: Web/Guide/HTML/Email_links
+slug: conflicting/Learn/HTML/Introduction_to_HTML/Creating_hyperlinks
tags:
- HTML5
- SEO
@@ -9,6 +9,7 @@ tags:
- mailto
translation_of: Learn/HTML/Introduction_to_HTML/Creating_hyperlinks#E-mail_links
translation_of_original: Web/Guide/HTML/Email_links
+original_slug: Web/Guide/HTML/Email_links
---
<p>这往往是有益的Web站点能够创建链接或按钮,点击后,打开一个新的出站电子邮件。例如,这可能会创造一个“联系我们”按钮时使用。这是使用完成<span class="seoSummary">{{HTMLElement("a")}} </span>元素和mailto URL方案。<span class="seoSummary">.</span></p>
diff --git a/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html b/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
index f1ebacd184..b2537fe024 100644
--- a/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
+++ b/files/zh-cn/conflicting/learn/html/multimedia_and_embedding/video_and_audio_content/index.html
@@ -1,6 +1,6 @@
---
title: 使用 HTML5 音频和视频
-slug: Web/Guide/HTML/Using_HTML5_audio_and_video
+slug: conflicting/Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
tags:
- Flash
- HTML
@@ -17,6 +17,7 @@ tags:
- 音频
translation_of: Learn/HTML/Multimedia_and_embedding/Video_and_audio_content
translation_of_original: Web/Guide/HTML/Using_HTML5_audio_and_video
+original_slug: Web/Guide/HTML/Using_HTML5_audio_and_video
---
<p>HTML5 通过HTML标签“audio”和“video”来支持嵌入式的媒体,使开发者能够方便地将媒体嵌入到HTML文档中。</p>