Update printing setup for networked printersnetwork-printer

Closes: https://gitlab.gnome.org/GNOME/gnome-user-docs/issues/51

4 files changed, 22 insertions, 95 deletions

diff --git a/gnome-help/C/printing-setup.page b/gnome-help/C/printing-setup.page
index 901b1f75..ed5f5321 100644
--- a/gnome-help/C/printing-setup.page
+++ b/gnome-help/C/printing-setup.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.10.2" date="2013-11-03" status="candidate"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="final"/>
     <revision pkgversion="3.18" date="2015-09-29" status="final"/>
+    <revision pkgversion="3.33.3" date="2019-07-19" status="candidate"/>
 
     <credit type="author">
       <name>Phil Bull</name>
@@ -34,25 +35,23 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Set up a printer that is connected to your computer.</desc>
+    <desc>Set up a printer that is connected to your computer, or your local
+    network.</desc>
   </info>
 
   <title>Set up a local printer</title>
 
-  <p>Your system can recognize many types of printers automatically once
-  they are connected. Most printers are connected with a USB cable that
-  attaches to your computer.</p>
+  <p>Your system can recognize many types of printers automatically once they
+  are connected. Most printers are connected with a USB cable that attaches to
+  your computer, but some printers connect to your wired or wireless
+  network.</p>
 
   <note style="tip">
-    <p>You do not need to select whether you want to install a network or local
-    printer now. They are listed in one window.</p>
+    <p>If your printer is connected to the network, it will not be set up
+    automatically - you should add it from the <gui>Printers</gui> panel in
+    <gui>Settings</gui>.</p>
   </note>
 
-  <comment>
-    <cite date="2012-02-19">shaunm</cite>
-    <p>Do we have anything on what to do when your printer isn't found? 3.0.1?</p>
-  </comment>
-
   <steps>
     <item>
       <p>Make sure the printer is turned on.</p>
@@ -74,8 +73,8 @@
 
   <steps>
     <item>
-      <p>Open the <gui xref="shell-introduction#activities">Activities</gui> overview and
-      start typing <gui>Printers</gui>.</p>
+      <p>Open the <gui xref="shell-introduction#activities">Activities</gui>
+      overview and start typing <gui>Printers</gui>.</p>
     </item>
     <item>
       <p>Click <gui>Printers</gui>.</p>
@@ -85,16 +84,21 @@
       type in your password when prompted.</p>
     </item>
     <item>
-      <p>Click the <gui style="button">Add a Printer…</gui> button.</p>
+      <p>Press the <gui style="button">Add…</gui> button.</p>
     </item>
     <item>
-      <p>In the pop-up window, select your new printer. Click
-      <gui>Add</gui>.</p>
+      <p>In the pop-up window, select your new printer and press
+      <gui style="button">Add</gui>.</p>
+      <note style="tip">
+        <p>If your printer is not discovered automatically, but you know its
+        network address, enter it into the text field at the bottom of the
+        dialog and then press <gui style="button">Add</gui></p>
+      </note>
     </item>
   </steps>
 
-  <p>If your printer does not appear in the Add a New Printer window, you may
-  need to install print drivers.</p>
+  <p>If your printer does not appear in the <gui>Add Printer</gui> window, you
+  may need to install print drivers.</p>
 
 <comment>
 <p>Add link to above when page is ready.
diff --git a/system-admin-guide/C/network-printer-config.page b/system-admin-guide/C/network-printer-config.page
deleted file mode 100644
index 60d3faa2..00000000
--- a/system-admin-guide/C/network-printer-config.page
+++ /dev/null
@@ -1,75 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="network-printer-config">
-
-  <info>
-    <link type="guide" xref="network" />
-    <revision pkgversion="3.30" date="2019-02-22" status="review"/>
-
-    <credit type="author copyright">
-      <name>Jana Svarova</name>
-      <email>jana.svarova@gmail.com</email>
-      <years>2013</years>
-    </credit>
-    <credit type="editor">
-      <name>Petr Kovar</name>
-      <email>pknbe@volny.cz</email>
-      <years>2019</years>
-    </credit>
-
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-
-    <desc>How do I configure a Samba printer?</desc>
-  </info>
-
-  <title>Configure a network printer</title>
-
-  <p>This topic explains how to make network printers, Windows printers in
-  particular, available in GNOME.</p>
-
-  <p>There is no preconfiguration needed for being able to install Samba 
-  printers using <app>GNOME Settings</app>. To add a new Samba printer to your
-  CUPS (Common UNIX Printing System) server, simply follow the steps below.</p>
-
-  <steps>
-    <title>Configure your printer</title>
-    <item>
-      <p>Open <gui>Activities overview</gui> and start typing
-      <gui>Printers</gui>.</p>
-    </item>
-    <item>
-      <p>Click <gui>Printers</gui>.</p>
-    </item>
-    <item>
-      <p>Unlock the <gui>Printers</gui> panel by clicking on the 
-      <gui>Unlock</gui> button.</p>
-    </item>
-    <item>
-      <p>Click the <gui>+</gui> button below the list of printers.</p>
-    </item>
-    <item>
-      <p>If your printers are public, wait for the printers which are 
-      available on your Windows network to appear. Otherwise, type the address
-      of the Samba server and press <key>Enter</key>.</p>
-    </item>
-    <item>
-      <p>When asked, authenticate yourself to Samba servers which need 
-      authentication to show their printers.</p>
-    </item>
-    <item>
-      <p>Select the printer to be installed.</p>
-    </item>
-    <item>
-      <p>Press the <gui>Add</gui> button.</p>
-    </item>
-    <item>
-      <p>From the drivers available on your computer, select a suitable driver
-      for your printer.</p>
-    </item>
-    <item>
-      <p>Press <key>Select</key>.</p>
-    </item>
-  </steps>
-
-</page>
diff --git a/system-admin-guide/C/network.page b/system-admin-guide/C/network.page
index c347746e..335d6097 100644
--- a/system-admin-guide/C/network.page
+++ b/system-admin-guide/C/network.page
@@ -9,7 +9,6 @@
 
     <desc>
       <link xref="network-server-list">Configure a default server list</link>,
-      <link xref="network-printer-config">a network printer</link>,
       <link xref="network-vpn">default VPN settings</link>…
     </desc>
 
diff --git a/system-admin-guide/Makefile.am b/system-admin-guide/Makefile.am
index a55fb7da..16b995f3 100644
--- a/system-admin-guide/Makefile.am
+++ b/system-admin-guide/Makefile.am
@@ -48,7 +48,6 @@ HELP_FILES = \
 	mime-types-custom-user.page \
 	mime-types.page	\
 	network.page \
-	network-printer-config.page \
 	network-server-list.page \
 	network-vpn.page \
 	overrides.page \