sharing: Use new about panel for changing hostname

7 files changed, 5 insertions, 50 deletions

diff --git a/gnome-help/C/bluetooth-visibility.page b/gnome-help/C/bluetooth-visibility.page
index ab94b3fb..54daa2ef 100644
--- a/gnome-help/C/bluetooth-visibility.page
+++ b/gnome-help/C/bluetooth-visibility.page
@@ -47,7 +47,7 @@
   to your computer.</p>
 
   <note style="tip">
-    <p>You can <link xref="sharing-displayname">change</link> the name your
+    <p>You can <link xref="about-hostname">change</link> the name your
     computer displays to other devices.</p>
   </note>
 
diff --git a/gnome-help/C/sharing-bluetooth.page b/gnome-help/C/sharing-bluetooth.page
index 67ddccb6..1f93a04a 100644
--- a/gnome-help/C/sharing-bluetooth.page
+++ b/gnome-help/C/sharing-bluetooth.page
@@ -56,7 +56,7 @@
   </steps>
 
   <note style="tip">
-    <p>You can <link xref="sharing-displayname">change</link> the name your
+    <p>You can <link xref="about-hostname">change</link> the name your
     computer displays to other devices.</p>
   </note>
 
diff --git a/gnome-help/C/sharing-desktop.page b/gnome-help/C/sharing-desktop.page
index 91a66413..428d16a2 100644
--- a/gnome-help/C/sharing-desktop.page
+++ b/gnome-help/C/sharing-desktop.page
@@ -74,7 +74,7 @@
       to off, click to switch it on.</p>
 
       <note style="info"><p>If the text below <gui>Device Name</gui> allows
-      you to edit it, you can <link xref="sharing-displayname">change</link>
+      you to edit it, you can <link xref="about-hostname">change</link>
       the name your computer displays on the network.</p></note>
     </item>
     <item>
diff --git a/gnome-help/C/sharing-displayname.page b/gnome-help/C/sharing-displayname.page
deleted file mode 100644
index 8399ff92..00000000
--- a/gnome-help/C/sharing-displayname.page
+++ /dev/null
@@ -1,44 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="sharing-displayname">
-
-  <info>
-    <link type="guide" xref="prefs-sharing" group="#first"/>
-
-    <revision pkgversion="3.12" date="2014-03-23" status="candidate"/>
-    <revision pkgversion="3.13.92" date="2014-09-22" status="final"/>
-
-    <credit type="author">
-      <name>Michael Hill</name>
-      <email>mdhillca@gmail.com</email>
-      <years>2014</years>
-    </credit>
-
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-    <desc>Control how your computer will appear to other computers or
-    devices.</desc>
-  </info>
-
-  <title>Set the display name for your computer</title>
-
-  <p>You can change the name your computer uses to display itself to other
-  computers or devices, on the network or over Bluetooth.</p>
-
-  <steps>
-    <title>Change the display name of your computer:</title>
-    <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Sharing</gui>.</p>
-    </item>
-    <item>
-      <p>Click on <gui>Sharing</gui> to open the panel.</p>
-    </item>
-    <item>
-      <p>Edit the text below <gui>Device Name</gui> to change the name your
-      computer displays on the network.</p>
-    </item>
-  </steps>
-
-</page>
diff --git a/gnome-help/C/sharing-media.page b/gnome-help/C/sharing-media.page
index 053ec9ec..8c61e142 100644
--- a/gnome-help/C/sharing-media.page
+++ b/gnome-help/C/sharing-media.page
@@ -64,7 +64,7 @@
       set to off, switch it to on.</p>
 
       <note style="info"><p>If the text below <gui>Device Name</gui> allows
-      you to edit it, you can <link xref="sharing-displayname">change</link>
+      you to edit it, you can <link xref="about-hostname">change</link>
       the name your computer displays on the network.</p></note>
     </item>
     <item>
diff --git a/gnome-help/C/sharing-personal.page b/gnome-help/C/sharing-personal.page
index 21a895e0..0b659045 100644
--- a/gnome-help/C/sharing-personal.page
+++ b/gnome-help/C/sharing-personal.page
@@ -73,7 +73,7 @@
       to off, switch it to on.</p>
 
       <note style="info"><p>If the text below <gui>Device Name</gui> allows
-      you to edit it, you can <link xref="sharing-displayname">change</link>
+      you to edit it, you can <link xref="about-hostname">change</link>
       the name your computer displays on the network.</p></note>
     </item>
     <item>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 76f7ea2b..95000e0d 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -407,7 +407,6 @@ HELP_FILES = \
 	sharing.page \
 	sharing-bluetooth.page \
 	sharing-desktop.page \
-	sharing-displayname.page \
 	sharing-media.page \
 	sharing-personal.page \
 	shell-apps-auto-start.page \