diff --git a/Netdisco/Changes b/Netdisco/Changes
index bde8186d..8b86f38d 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,16 @@
+2.031005 - 2015-02-06
+
+  [ENHANCEMENTS]
+
+  * Change netdisco-do "delete" command to use -p param for archive (preserve)
+  * Add documentation to Troubleshooting page explaining devices/nodes
+
+  [BUG FIXES]
+
+  * Fix netdisco-do "power" action to accept yes/no in -e param
+  * Fix undef error when printing netdisco-do help
+  * Minor documentation fixes
+
 2.031004 - 2015-02-05
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
index 619d74c4..4c5a2bc7 100644
--- a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
@@ -36,6 +36,15 @@ but they are backwards compatible.
 
 =back
 
+=head1 2.031005
+
+=head2 General Notices
+
+The C<netdisco-do> command's C<delete> option now uses the C<-p> parameter to
+set node archive mode (previously it was a hack on C<-e>). For example:
+
+ ~netdisco/bin/netdisco-do delete -d 192.0.2.1 -e 'older than the sun' -p yes
+
 =head1 2.031003
 
 =head2 Health Advice
diff --git a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
index 5c4af988..77911a35 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Troubleshooting.pod
@@ -2,7 +2,38 @@
 
 App::Netdisco::Manual::Troubleshooting - Tips and Tricks for Troubleshooting
 
-=head1 Run a Polling Job with Debugging
+=head1 Understanding Nodes and Devices
+
+The two basic components in Netdisco's world are Nodes and Devices. Devices
+are your network hardware, such as routers, switches, and firewalls. Nodes are
+the end-stations connected to Devices, such as workstations, servers,
+printers, and telephones.
+
+Devices respond to SNMP, and therefore can report useful information about
+themselves such as interfaces, operating system, IP addresses, as well as
+knowledge of other systems via MAC address and ARP tables. Devices are
+actively contacted by Netdisco during a discover (and other polling jobs such
+as macsuck, arpnip).
+
+Nodes on the other hand are passive as far as Netdisco is concerned. The only
+job which contacts a Node is nbtstat, which makes NetBIOS queries. Nodes are
+learned about via the MAC and ARP tables on Devices. Sometimes you might run
+an SNMP agent on a server (Node), and in this case Netdisco will treat it as a
+Device unless you prevent this using the C<discover_no> or C<discover_only>
+configuration.
+
+Netdisco discovers Devices using "neighbor protocols" such as CDP and LLDP. We
+assume your Devices are running these protocols and learning about their
+connections to each other. If they aren't, you'll need to configure manual
+topology within the web interface (or simply have standalone Devices).
+
+If you don't see links between Devices in Netdisco, it's either because
+they're not running a neighbor protocol, or for some reason not reporting the
+relationships to Netdisco. Use the C<show> command to troubleshoot this:
+
+ ~netdisco/bin/netdisco-do show -d 192.0.2.1 -e c_id
+
+=head1 Run a C<netdisco-do> Task with Debugging
 
 The C<netdisco-do> command has several debug flags which will show what's
 going on internally. Usually you always add C<-D> for general Netdisco