relinked to newer examples

29 files changed, 274 insertions, 324 deletions

diff --git a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/advanced-topics.rst
index 7bfcc0c..5803a50 100644
--- a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/advanced-topics.rst
@@ -4,35 +4,37 @@
 Advanced topics
 ---------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-custom-engine-id.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-custom-engine-id.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-custom-engine-id.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/custom-snmp-engine-id.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-observe-request-processing.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-observe-request-processing.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-observe-request-processing.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/observe-request-processing.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-snmp-engines.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-snmp-engines.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-snmp-engines.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-engines.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
index f685ff3..1d955d9 100644
--- a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
@@ -4,46 +4,48 @@
 Agent-side MIB implementations
 ------------------------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-scalar-mib-objects.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-tabular-mib-objects.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-tabular-mib-objects.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v2c-custom-tabular-mib-objects.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/implementing-snmp-table.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/alternative-mib-tree.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib-controller.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib-controller.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-alternative-mib-controller.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/custom-mib-controller.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/snmp-versions.rst b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/snmp-versions.rst
index 3bbc86e..9571f77 100644
--- a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/snmp-versions.rst
@@ -4,24 +4,26 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v1-read-and-write-communities.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v1-read-and-write-communities.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v1-read-and-write-communities.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/multiple-usm-users.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-users.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-users.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-multiple-users.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/multiple-snmp-communities.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/transport-tweaks.rst b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/transport-tweaks.rst
index bb7d0db..23a3b60 100644
--- a/docs/source/examples/v3arch/asyncore/agent/cmdrsp/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/cmdrsp/transport-tweaks.rst
@@ -4,35 +4,37 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-interfaces.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-interfaces.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-interfaces.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-ipv4-and-ipv6-interfaces.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-transports.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-transports.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v2c-multiple-transports.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/listen-on-multiple-interfaces.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-preserve-original-destination-address.py
+.. include:: /../../examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/v3-preserve-original-destination-address.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/v3-preserve-original-destination-address.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/cmdrsp/listening-on-virtual-network-interface.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/advanced-topics.rst
index 83fda00..4724b3a 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/advanced-topics.rst
@@ -4,13 +4,15 @@
 Advanced topic
 --------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-custom-pdu.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-custom-pdu.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-custom-pdu.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/send-custom-pdu.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/common-notifications.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/common-notifications.rst
index 749c4ff..fc31852 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/common-notifications.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/common-notifications.rst
@@ -4,43 +4,34 @@
 Common notifications
 --------------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py>` script.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py>` script.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/inform-v2c.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-inform.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/inform-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-inform.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/inform-v2c.py>` script.
-
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/inform-v3.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/inform-v3.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/inform-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v2c-inform.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/evaluating-notification-type.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/evaluating-notification-type.rst
index 6ec5acc..72a3469 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/evaluating-notification-type.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/evaluating-notification-type.rst
@@ -13,14 +13,15 @@ Consequently, sending specific NOTIFICATION-TYPE implies including certain
 set of OIDs into PDU. PySNMP offers this facility through NotificationType
 class.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-with-objects.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-with-objects.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-with-objects.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v2c-trap-via-notification-type.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/multiple-managers-operations.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/multiple-managers-operations.rst
index 538f40b..4fe6b97 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/multiple-managers-operations.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/multiple-managers-operations.rst
@@ -10,33 +10,35 @@ different network addresses over different SNMP versions/credentials.
 
 The following few examples use this facility.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/inform-multiple-protocols.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/inform-multiple-protocols.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/inform-multiple-protocols.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/send-inform-to-multiple-managers.py>` script.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-addresses.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-addresses.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-addresses.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/send-trap-to-multiple-managers.py>` script.
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-transports.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-transports.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c-multiple-transports.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/multiple-different-notifications-at-once.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/snmp-versions.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/snmp-versions.rst
index 2b56cba..bcc51e7 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/snmp-versions.rst
@@ -4,36 +4,48 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v1.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v1-trap.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v2c.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v2c-trap.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v3.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/v3-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v3.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/v3-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/v3-trap.py>` script.
 
 
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/usm-md5-none.py>` script.
+
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/agent/ntforg/transport-tweaks.rst b/docs/source/examples/v3arch/asyncore/agent/ntforg/transport-tweaks.rst
index e949255..a387896 100644
--- a/docs/source/examples/v3arch/asyncore/agent/ntforg/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/agent/ntforg/transport-tweaks.rst
@@ -4,13 +4,26 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1-from-specific-address.py
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/trap-v1-from-specific-address.py
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/trap-v1-from-specific-address.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/send-notification-over-ipv4-and-ipv6.py>` script.
 
+
+.. include:: /../../examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/agent/ntforg/send-packet-from-specific-address.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/contents.rst b/docs/source/examples/v3arch/asyncore/contents.rst
index 54db9fc..3b1295b 100644
--- a/docs/source/examples/v3arch/asyncore/contents.rst
+++ b/docs/source/examples/v3arch/asyncore/contents.rst
@@ -30,8 +30,6 @@ Command Generator Applications
    /examples/v3arch/asyncore/manager/cmdgen/mib-tweaks
    /examples/v3arch/asyncore/manager/cmdgen/transport-tweaks
    /examples/v3arch/asyncore/manager/cmdgen/advanced-topics
-.. XXX /examples/v3arch/asyncore/manager/cmdgen/asynchronous-operations
-
 
 Command Responder Applications
 ------------------------------
@@ -54,8 +52,6 @@ Notification Originator Applications
    /examples/v3arch/asyncore/agent/ntforg/multiple-managers-operations
    /examples/v3arch/asyncore/agent/ntforg/transport-tweaks
    /examples/v3arch/asyncore/agent/ntforg/advanced-topics
-.. XXX /examples/v3arch/asyncore/agent/ntforg/snmp-v1-trap-variants
-
 
 Notification Receiver Applications
 ----------------------------------
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/advanced-topics.rst
index 1514953..3b24a2b 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/advanced-topics.rst
@@ -4,25 +4,26 @@
 Advanced topics
 ---------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-custom-context.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-custom-context.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-custom-context.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/custom-contextengineid-and-contextname.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-observe-request-processing.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-observe-request-processing.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-observe-request-processing.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/observe-request-processing.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/mib-tweaks.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/mib-tweaks.rst
index 36bcbde..68d4b3e 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/mib-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/mib-tweaks.rst
@@ -4,44 +4,15 @@
 MIB tweaks
 ----------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-compilation-and-lookup.py>` script.
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-with-custom-mib-path-and-options.py>` script.
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6-with-mib-lookup.py>` script.
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-resolution.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-resolution.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-with-mib-resolution.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-and-resolve-with-mib.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/modifying-variables.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/modifying-variables.rst
index d8f659e..b28d08f 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/modifying-variables.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/modifying-variables.rst
@@ -5,36 +5,15 @@
 Modifying values
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v1.py 
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v1.py 
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/set-v1.py >` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v2c.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v2c.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/set-v2c.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v3.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/set-v3.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/set-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/set-multiple-scalar-values.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/snmp-versions.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/snmp-versions.rst
index 803dfb2..357cbfb 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/snmp-versions.rst
@@ -4,69 +4,48 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v1.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/v1-get.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v1.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/v1-get.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v1.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/v1-get.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-custom-timeout.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/v2c-set.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-custom-timeout.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/v2c-set.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-custom-timeout.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/v2c-set.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-aes128.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-with-mib-lookup.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-with-mib-lookup.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-with-mib-lookup.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv-sha-aes128.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv-sha-aes128.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-auth-priv-sha-aes128.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/usm-sha-none.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/table-operations.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/table-operations.rst
index a650698..84b64e6 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/table-operations.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/table-operations.rst
@@ -4,56 +4,25 @@
 Table operations
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py>` script.
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-index.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-index.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-index.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/pull-subtree.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-multiple-indices.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-multiple-indices.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v3-table-object-by-multiple-indices.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3-over-ipv6-with-mib-lookup.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c-limiting-number-of-rows.py 
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c-limiting-number-of-rows.py 
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c-limiting-number-of-rows.py>` script.
-
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/transport-tweaks.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/transport-tweaks.rst
index e519230..39f12af 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/transport-tweaks.rst
@@ -4,37 +4,48 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-spoof-source-address.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-spoof-source-address.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/get-v2c-spoof-source-address.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/custom-timeout-and-retries.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c-from-specific-address.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/send-packets-from-specific-interface.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-over-ipv6.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/spoof-source-address.py>` script.
 
 
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/fetch-variables-over-ipv6.py>` script.
+
 
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/cmdgen/walking-operations.rst b/docs/source/examples/v3arch/asyncore/manager/cmdgen/walking-operations.rst
index 334b820..f4454c6 100644
--- a/docs/source/examples/v3arch/asyncore/manager/cmdgen/walking-operations.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/cmdgen/walking-operations.rst
@@ -4,58 +4,26 @@
 Walking operations
 ------------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v2c.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-multiple-oids-to-eom.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3.py
+.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getbulk-v3.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v1.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-pull-subtree.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-pull-subtree.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v3-pull-subtree.py>` script.
-
-
-.. include:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-v2c.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/cmdgen/getnext-multiple-oids-to-eom.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
index c7222f6..08f4169 100644
--- a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
@@ -4,25 +4,26 @@
 Advanced topics
 ---------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-observe-request-processing.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-observe-request-processing.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v2c-observe-request-processing.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-regexp-community-name.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-regexp-community-name.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-regexp-community-name.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/snmp-versions.rst b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/snmp-versions.rst
index 2f67e9d..d3cb123 100644
--- a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/snmp-versions.rst
@@ -4,14 +4,26 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v3-multiple-users.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v3-multiple-users.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v3-multiple-users.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py>` script.
 
 
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-usm-users.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
index 8e4272f..4885243 100644
--- a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
@@ -4,36 +4,37 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-interfaces.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-interfaces.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-interfaces.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-transports.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-transports.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v2c-multiple-transports.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-request-details.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-request-details.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/v2c-with-request-details.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/advanced-topics.rst
index 2c44e98..93fa2dc 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/advanced-topics.rst
@@ -4,24 +4,25 @@
 Advanced topic
 --------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextname.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextname.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextname.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextname.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextname.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextname.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextengineid.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextengineid.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextengineid.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextengineid.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3-with-custom-contextengineid.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-contextengineid.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/asynchronous-operations.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/asynchronous-operations.rst
index 4bde125..5eee2b1 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/asynchronous-operations.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/asynchronous-operations.rst
@@ -4,24 +4,37 @@
 Asynchronous operations
 -----------------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-async-multiple-transports-and-protocols.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-traps-at-once.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-async-multiple-transports-and-protocols.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-traps-at-once.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-async-multiple-transports-and-protocols.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-traps-at-once.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-informs-at-once.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-informs-at-once.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-async-multiple-snmp-engines.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-multiple-informs-at-once.py>` script.
 
+
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-running-multiple-snmp-engines-at-once.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-running-multiple-snmp-engines-at-once.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/async-running-multiple-snmp-engines-at-once.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/common-notifications.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/common-notifications.rst
index c4eb733..9042e83 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/common-notifications.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/common-notifications.rst
@@ -4,24 +4,25 @@
 Common notifications
 --------------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-inform.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-inform.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-inform.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/evaluating-notification-type.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/evaluating-notification-type.rst
index 1a0c8f5..30d799f 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/evaluating-notification-type.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/evaluating-notification-type.rst
@@ -4,14 +4,26 @@
 Evaluating NOTIFICATION-TYPE
 ----------------------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v2c-with-mib-lookup.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v2c-with-mib-lookup.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/inform-v2c-with-mib-lookup.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py>` script.
 
 
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/send-notification-with-additional-varbinds.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/send-notification-with-additional-varbinds.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/send-notification-with-additional-varbinds.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-v1-trap-variants.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-v1-trap-variants.rst
index 8ed93c8..d9e59eb 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-v1-trap-variants.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-v1-trap-variants.rst
@@ -4,25 +4,26 @@
 SNMPv1 TRAP variants
 --------------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/custom-v1-trap.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-custom-values.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-custom-values.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-custom-values.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-versions.rst b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-versions.rst
index 573af2e..efbed53 100644
--- a/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncore/oneliner/agent/ntforg/snmp-versions.rst
@@ -4,36 +4,37 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/default-v1-trap.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v2c-with-mib-lookup.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/v2c-trap-via-notification-type.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v3-with-custom-engineid.py
+.. include:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v3-with-custom-engineid.py
+.. literalinclude:: /../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v3-with-custom-engineid.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/oneliner/agent/ntforg/v3-trap.py>` script.
 
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/proxy/command/protocol-conversion.rst b/docs/source/examples/v3arch/asyncore/proxy/command/protocol-conversion.rst
index 5bfa01b..a39e233 100644
--- a/docs/source/examples/v3arch/asyncore/proxy/command/protocol-conversion.rst
+++ b/docs/source/examples/v3arch/asyncore/proxy/command/protocol-conversion.rst
@@ -36,3 +36,5 @@ Protocol conversion
 
 :download:`Download</../../examples/v3arch/asyncore/proxy/command/v3-to-v2c-conversion.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst b/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
index d7244cc..7a5a715 100644
--- a/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
+++ b/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
@@ -14,3 +14,5 @@ Transport conversion
 
 :download:`Download</../../examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.