relinked to newer examples

33 files changed, 203 insertions, 125 deletions

diff --git a/docs/source/examples/contents.rst b/docs/source/examples/contents.rst
index 8257a32..eabdafe 100644
--- a/docs/source/examples/contents.rst
+++ b/docs/source/examples/contents.rst
@@ -49,7 +49,7 @@ APIs are:
 
          /examples/v3arch/twisted/contents
 
-#. Packet-level API that lets you build SNMP messages from Python 
+#. Low-level API that lets you build SNMP messages from Python 
    objects and exchange them through asyncore transport (or you could 
    write your own). These interfaces are very low-level and aimed at 
    a rather specific programming tasks.
@@ -59,6 +59,15 @@ APIs are:
 
       /examples/v1arch/asyncore/contents
 
+.. comment #. SMI subsystem is separated from SNMP protocol implementation, and
+   consists of MIB files processing, MIB browsing and MIB variables
+   management subsystems.
+
+   .. toctree::
+      :maxdepth: 2
+
+      /examples/v1arch/smi/contents
+
 Before doing cut&paste of the code below into your Python interpreter, 
 make sure to install pysnmp and its dependencies by running pip or 
 easy_install: ::
diff --git a/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst b/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
index 1cee1f4..8f34d89 100644
--- a/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
+++ b/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
@@ -14,3 +14,5 @@ Agent-side MIB implementations
 
 :download:`Download</../../examples/v1arch/asyncore/agent/cmdrsp/v2c-custom-scalar-mib-objects.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/agent/ntforg/transport-tweaks.rst b/docs/source/examples/v1arch/asyncore/agent/ntforg/transport-tweaks.rst
index 3d31d4c..7725901 100644
--- a/docs/source/examples/v1arch/asyncore/agent/ntforg/transport-tweaks.rst
+++ b/docs/source/examples/v1arch/asyncore/agent/ntforg/transport-tweaks.rst
@@ -25,3 +25,5 @@ Transport tweaks
 
 :download:`Download</../../examples/v1arch/asyncore/agent/ntforg/inform-v2c.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/contents.rst b/docs/source/examples/v1arch/asyncore/contents.rst
index a4b1281..3259fce 100644
--- a/docs/source/examples/v1arch/asyncore/contents.rst
+++ b/docs/source/examples/v1arch/asyncore/contents.rst
@@ -1,6 +1,6 @@
 
-Packet-level SNMP
-=================
+Low-level SNMP
+==============
 
 In cases where performance is your top priority and you only need to 
 work with SNMP v1 and v2c systems and you do not mind writing much 
diff --git a/docs/source/examples/v1arch/asyncore/manager/cmdgen/advanced-topics.rst b/docs/source/examples/v1arch/asyncore/manager/cmdgen/advanced-topics.rst
index 3b1541a..845e607 100644
--- a/docs/source/examples/v1arch/asyncore/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/v1arch/asyncore/manager/cmdgen/advanced-topics.rst
@@ -25,3 +25,5 @@ Advanced topics
 
 :download:`Download</../../examples/v1arch/asyncore/manager/cmdgen/get-v2c-udp-broadcast-agent-discovery.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/manager/cmdgen/fetching-variables.rst b/docs/source/examples/v1arch/asyncore/manager/cmdgen/fetching-variables.rst
index 590a3a1..44d9d8a 100644
--- a/docs/source/examples/v1arch/asyncore/manager/cmdgen/fetching-variables.rst
+++ b/docs/source/examples/v1arch/asyncore/manager/cmdgen/fetching-variables.rst
@@ -14,3 +14,5 @@ Fetching variables
 
 :download:`Download</../../examples/v1arch/asyncore/manager/cmdgen/get-v1.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/manager/cmdgen/modifying-variables.rst b/docs/source/examples/v1arch/asyncore/manager/cmdgen/modifying-variables.rst
index 4c77528..3fc9926 100644
--- a/docs/source/examples/v1arch/asyncore/manager/cmdgen/modifying-variables.rst
+++ b/docs/source/examples/v1arch/asyncore/manager/cmdgen/modifying-variables.rst
@@ -14,3 +14,5 @@ Modifying variables
 
 :download:`Download</../../examples/v1arch/asyncore/manager/cmdgen/set-v2c.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/manager/cmdgen/walking-operations.rst b/docs/source/examples/v1arch/asyncore/manager/cmdgen/walking-operations.rst
index d3bbf7b..93866fa 100644
--- a/docs/source/examples/v1arch/asyncore/manager/cmdgen/walking-operations.rst
+++ b/docs/source/examples/v1arch/asyncore/manager/cmdgen/walking-operations.rst
@@ -25,3 +25,5 @@ MIB walking operations
 
 :download:`Download</../../examples/v1arch/asyncore/manager/cmdgen/getbulk-v2c.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v1arch/asyncore/manager/ntfrcv/transport-tweaks.rst b/docs/source/examples/v1arch/asyncore/manager/ntfrcv/transport-tweaks.rst
index 41ee459..9c921ef 100644
--- a/docs/source/examples/v1arch/asyncore/manager/ntfrcv/transport-tweaks.rst
+++ b/docs/source/examples/v1arch/asyncore/manager/ntfrcv/transport-tweaks.rst
@@ -14,3 +14,5 @@ Transport tweaks
 
 :download:`Download</../../examples/v1arch/asyncore/manager/ntfrcv/v1-multiple-transports.py>` script.
 
+
+See also: :doc:`library-reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/agent/cmdrsp/snmp-versions.rst b/docs/source/examples/v3arch/asyncio/agent/cmdrsp/snmp-versions.rst
index b067178..b84cb7e 100644
--- a/docs/source/examples/v3arch/asyncio/agent/cmdrsp/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncio/agent/cmdrsp/snmp-versions.rst
@@ -4,13 +4,14 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncio/agent/cmdrsp/v3-multiple-users.py
+.. include:: /../../examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/agent/cmdrsp/v3-multiple-users.py
+.. literalinclude:: /../../examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/agent/cmdrsp/v3-multiple-users.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/agent/cmdrsp/multiple-usm-users.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/agent/ntforg/common-notifications.rst b/docs/source/examples/v3arch/asyncio/agent/ntforg/common-notifications.rst
index 0e1ff6e..75a2b2e 100644
--- a/docs/source/examples/v3arch/asyncio/agent/ntforg/common-notifications.rst
+++ b/docs/source/examples/v3arch/asyncio/agent/ntforg/common-notifications.rst
@@ -4,23 +4,24 @@
 Common notifications
 --------------------
 
-.. include:: /../../examples/v3arch/asyncio/agent/ntforg/trap-v1.py
+.. include:: /../../examples/v3arch/asyncio/agent/ntforg/v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/agent/ntforg/trap-v1.py
+.. literalinclude:: /../../examples/v3arch/asyncio/agent/ntforg/v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/agent/ntforg/trap-v1.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/agent/ntforg/v1-trap.py>` script.
 
-.. include:: /../../examples/v3arch/asyncio/agent/ntforg/inform-v3.py
+.. include:: /../../examples/v3arch/asyncio/agent/ntforg/v3-inform.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/agent/ntforg/inform-v3.py
+.. literalinclude:: /../../examples/v3arch/asyncio/agent/ntforg/v3-inform.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/agent/ntforg/inform-v3.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/agent/ntforg/v3-inform.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/manager/cmdgen/modifying-variables.rst b/docs/source/examples/v3arch/asyncio/manager/cmdgen/modifying-variables.rst
index b148147..3aa13a9 100644
--- a/docs/source/examples/v3arch/asyncio/manager/cmdgen/modifying-variables.rst
+++ b/docs/source/examples/v3arch/asyncio/manager/cmdgen/modifying-variables.rst
@@ -4,13 +4,15 @@
 Modifying values
 ----------------
 
-.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/set-v2c.py
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/set-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/set-v2c.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/manager/cmdgen/snmp-versions.rst b/docs/source/examples/v3arch/asyncio/manager/cmdgen/snmp-versions.rst
index e525dbc..81d8283 100644
--- a/docs/source/examples/v3arch/asyncio/manager/cmdgen/snmp-versions.rst
+++ b/docs/source/examples/v3arch/asyncio/manager/cmdgen/snmp-versions.rst
@@ -4,13 +4,25 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-custom-timeout.py
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-custom-timeout.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-custom-timeout.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/set-multiple-scalar-values.py>` script.
 
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/fetch-scalar-value.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/fetch-scalar-value.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/fetch-scalar-value.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/manager/cmdgen/transport-tweaks.rst b/docs/source/examples/v3arch/asyncio/manager/cmdgen/transport-tweaks.rst
index 48aae2d..e1f4aea 100644
--- a/docs/source/examples/v3arch/asyncio/manager/cmdgen/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncio/manager/cmdgen/transport-tweaks.rst
@@ -4,13 +4,15 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-over-ipv6.py
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-over-ipv6.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/get-v2c-over-ipv6.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/manager/cmdgen/walking-operations.rst b/docs/source/examples/v3arch/asyncio/manager/cmdgen/walking-operations.rst
index 52f3ed7..9ef26ec 100644
--- a/docs/source/examples/v3arch/asyncio/manager/cmdgen/walking-operations.rst
+++ b/docs/source/examples/v3arch/asyncio/manager/cmdgen/walking-operations.rst
@@ -4,24 +4,25 @@
 Walking operations
 ------------------
 
-.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/v2c-getbulk.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/v2c-getbulk.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/getnext-v2c-from-specific-address.py>` script
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/v2c-getbulk.py>` script
 
-
-.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/getbulk-v2c.py
+.. include:: /../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/getbulk-v2c.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/getbulk-v2c.py>` script
+:download:`Download</../../examples/v3arch/asyncio/manager/cmdgen/send-packet-from-specific-address.py>` script
+
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/asyncio/manager/ntfrcv/transport-tweaks.rst b/docs/source/examples/v3arch/asyncio/manager/ntfrcv/transport-tweaks.rst
index 77d85b7..98f152b 100644
--- a/docs/source/examples/v3arch/asyncio/manager/ntfrcv/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncio/manager/ntfrcv/transport-tweaks.rst
@@ -4,13 +4,15 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/asyncio/manager/ntfrcv/v2c-multiple-interfaces.py
+.. include:: /../../examples/v3arch/asyncio/manager/ntfrcv/multiple-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncio/manager/ntfrcv/v2c-multiple-interfaces.py
+.. literalinclude:: /../../examples/v3arch/asyncio/manager/ntfrcv/multiple-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncio/manager/ntfrcv/v2c-multiple-interfaces.py>` script.
+:download:`Download</../../examples/v3arch/asyncio/manager/ntfrcv/multiple-interfaces.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/trollius/agent/ntforg/common-notifications.rst b/docs/source/examples/v3arch/trollius/agent/ntforg/common-notifications.rst
index e20d4cc..fc41a50 100644
--- a/docs/source/examples/v3arch/trollius/agent/ntforg/common-notifications.rst
+++ b/docs/source/examples/v3arch/trollius/agent/ntforg/common-notifications.rst
@@ -4,23 +4,25 @@
 Common notifications
 --------------------
 
-.. include:: /../../examples/v3arch/trollius/agent/ntforg/trap-v1.py
+.. include:: /../../examples/v3arch/trollius/agent/ntforg/v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/agent/ntforg/trap-v1.py
+.. literalinclude:: /../../examples/v3arch/trollius/agent/ntforg/v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/agent/ntforg/trap-v1.py>` script.
+:download:`Download</../../examples/v3arch/trollius/agent/ntforg/v1-trap.py>` script.
 
-.. include:: /../../examples/v3arch/trollius/agent/ntforg/inform-v3.py
+.. include:: /../../examples/v3arch/trollius/agent/ntforg/v3-inform.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/agent/ntforg/inform-v3.py
+.. literalinclude:: /../../examples/v3arch/trollius/agent/ntforg/v3-inform.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/agent/ntforg/inform-v3.py>` script.
+:download:`Download</../../examples/v3arch/trollius/agent/ntforg/v3-inform.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/trollius/manager/cmdgen/fetching-values.rst b/docs/source/examples/v3arch/trollius/manager/cmdgen/fetching-values.rst
index 3ce4683..234f989 100644
--- a/docs/source/examples/v3arch/trollius/manager/cmdgen/fetching-values.rst
+++ b/docs/source/examples/v3arch/trollius/manager/cmdgen/fetching-values.rst
@@ -4,13 +4,15 @@
 Fetching values
 ---------------
 
-.. include:: /../../examples/v3arch/trollius/manager/cmdgen/get-v1.py
+.. include:: /../../examples/v3arch/trollius/manager/cmdgen/v1-get.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/get-v1.py
+.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/v1-get.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/get-v1.py>` script.
+:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/v1-get.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/trollius/manager/cmdgen/modifying-variables.rst b/docs/source/examples/v3arch/trollius/manager/cmdgen/modifying-variables.rst
index 148f305..191583c 100644
--- a/docs/source/examples/v3arch/trollius/manager/cmdgen/modifying-variables.rst
+++ b/docs/source/examples/v3arch/trollius/manager/cmdgen/modifying-variables.rst
@@ -4,13 +4,15 @@
 Modifying values
 ----------------
 
-.. include:: /../../examples/v3arch/trollius/manager/cmdgen/set-v2c.py
+.. include:: /../../examples/v3arch/trollius/manager/cmdgen/set-scalar-value.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/set-v2c.py
+.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/set-scalar-value.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/set-v2c.py>` script.
+:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/set-scalar-value.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/trollius/manager/cmdgen/transport-tweaks.rst b/docs/source/examples/v3arch/trollius/manager/cmdgen/transport-tweaks.rst
index ef44d47..9771d17 100644
--- a/docs/source/examples/v3arch/trollius/manager/cmdgen/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/trollius/manager/cmdgen/transport-tweaks.rst
@@ -4,13 +4,15 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/trollius/manager/cmdgen/get-v2c-custom-timeout.py
+.. include:: /../../examples/v3arch/trollius/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/get-v2c-custom-timeout.py
+.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/get-v2c-custom-timeout.py>` script.
+:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/custom-timeout-and-retries.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/trollius/manager/cmdgen/walking-operations.rst b/docs/source/examples/v3arch/trollius/manager/cmdgen/walking-operations.rst
index 3151147..e097016 100644
--- a/docs/source/examples/v3arch/trollius/manager/cmdgen/walking-operations.rst
+++ b/docs/source/examples/v3arch/trollius/manager/cmdgen/walking-operations.rst
@@ -4,23 +4,15 @@
 Walking operations
 ------------------
 
-.. include:: /../../examples/v3arch/trollius/manager/cmdgen/getnext-v3.py
+.. include:: /../../examples/v3arch/trollius/manager/cmdgen/v3-getbulk.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/getnext-v3.py
+.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/v3-getbulk.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/getnext-v3.py>` script.
+:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/v3-getbulk.py>` script.
 
-.. include:: /../../examples/v3arch/trollius/manager/cmdgen/getbulk-v3.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/trollius/manager/cmdgen/getbulk-v3.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/trollius/manager/cmdgen/getbulk-v3.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/agent/cmdrsp/agent-side-mib-implementations.rst b/docs/source/examples/v3arch/twisted/agent/cmdrsp/agent-side-mib-implementations.rst
index 38b17d1..1597b42 100644
--- a/docs/source/examples/v3arch/twisted/agent/cmdrsp/agent-side-mib-implementations.rst
+++ b/docs/source/examples/v3arch/twisted/agent/cmdrsp/agent-side-mib-implementations.rst
@@ -4,13 +4,15 @@
 Agent-side MIB implementations
 ------------------------------
 
-.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
+.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/v2c-custom-scalar-mib-objects.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/implementing-scalar-mib-objects.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/agent/cmdrsp/snmp-versions.rst b/docs/source/examples/v3arch/twisted/agent/cmdrsp/snmp-versions.rst
index 3691182..5373ffd 100644
--- a/docs/source/examples/v3arch/twisted/agent/cmdrsp/snmp-versions.rst
+++ b/docs/source/examples/v3arch/twisted/agent/cmdrsp/snmp-versions.rst
@@ -4,24 +4,26 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py
+.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/v1-read-and-write-communities.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/multiple-snmp-communities.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py
+.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/v3-multiple-users.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/multiple-usm-users.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/agent/cmdrsp/transport-tweaks.rst b/docs/source/examples/v3arch/twisted/agent/cmdrsp/transport-tweaks.rst
index fc1764f..c211aeb 100644
--- a/docs/source/examples/v3arch/twisted/agent/cmdrsp/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/twisted/agent/cmdrsp/transport-tweaks.rst
@@ -4,13 +4,15 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py
+.. include:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/v2c-multiple-interfaces.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/cmdrsp/multiple-interfaces.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/agent/ntforg/common-notifications.rst b/docs/source/examples/v3arch/twisted/agent/ntforg/common-notifications.rst
index f90cf46..8ffc673 100644
--- a/docs/source/examples/v3arch/twisted/agent/ntforg/common-notifications.rst
+++ b/docs/source/examples/v3arch/twisted/agent/ntforg/common-notifications.rst
@@ -4,45 +4,47 @@
 Common notifications
 --------------------
 
-.. include:: /../../examples/v3arch/twisted/agent/ntforg/trap-v1.py
+.. include:: /../../examples/v3arch/twisted/agent/ntforg/v1-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/trap-v1.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/v1-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/ntforg/trap-v1.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/ntforg/v1-trap.py>` script.
 
-.. include:: /../../examples/v3arch/twisted/agent/ntforg/trap-v3.py
+.. include:: /../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/trap-v3.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/ntforg/trap-v3.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py
+.. include:: /../../examples/v3arch/twisted/agent/ntforg/usm-md5-none.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/usm-md5-none.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/ntforg/inform-v2c.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/ntforg/usm-md5-none.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/agent/ntforg/inform-v3.py
+.. include:: /../../examples/v3arch/twisted/agent/ntforg/v3-trap.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/inform-v3.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/v3-trap.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/ntforg/inform-v3.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/ntforg/v3-trap.py>` script.
+
 
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/agent/ntforg/multiple-managers-operations.rst b/docs/source/examples/v3arch/twisted/agent/ntforg/multiple-managers-operations.rst
index 858d9fc..b234d56 100644
--- a/docs/source/examples/v3arch/twisted/agent/ntforg/multiple-managers-operations.rst
+++ b/docs/source/examples/v3arch/twisted/agent/ntforg/multiple-managers-operations.rst
@@ -4,13 +4,15 @@
 Multiple managers operations
 ----------------------------
 
-.. include:: /../../examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py
+.. include:: /../../examples/v3arch/twisted/agent/ntforg/send-inform-to-multiple-managers.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py
+.. literalinclude:: /../../examples/v3arch/twisted/agent/ntforg/send-inform-to-multiple-managers.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/agent/ntforg/trap-v2c-multiple-targets.py>` script.
+:download:`Download</../../examples/v3arch/twisted/agent/ntforg/send-inform-to-multiple-managers.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/cmdgen/advanced-topics.rst b/docs/source/examples/v3arch/twisted/manager/cmdgen/advanced-topics.rst
index 9a6bcdf..621d7d6 100644
--- a/docs/source/examples/v3arch/twisted/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/v3arch/twisted/manager/cmdgen/advanced-topics.rst
@@ -4,13 +4,15 @@
 Advanced topics
 ---------------
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/custom-contextengineid-and-contextname.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/custom-contextengineid-and-contextname.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/get-v3-custom-context.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/custom-contextengineid-and-contextname.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/cmdgen/snmp-versions.rst b/docs/source/examples/v3arch/twisted/manager/cmdgen/snmp-versions.rst
index c2f6695..3f7c8c5 100644
--- a/docs/source/examples/v3arch/twisted/manager/cmdgen/snmp-versions.rst
+++ b/docs/source/examples/v3arch/twisted/manager/cmdgen/snmp-versions.rst
@@ -4,24 +4,48 @@
 Various SNMP versions
 ----------------------
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/get-v1.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/v1-get.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/get-v1.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/v1-get.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/get-v1.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/v1-get.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/get-v3.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/get-v3.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/get-v3.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py>` script.
 
+
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/usm-sha-none.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/usm-sha-none.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/usm-sha-none.py>` script.
+
+
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/usm-sha-aes.py
+   :start-after: """
+   :end-before: """#
+
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/usm-sha-aes.py
+   :start-after: """#
+   :language: python
+
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/usm-sha-aes.py>` script.
+
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/cmdgen/table-operations.rst b/docs/source/examples/v3arch/twisted/manager/cmdgen/table-operations.rst
index 22a5ca9..ac6e616 100644
--- a/docs/source/examples/v3arch/twisted/manager/cmdgen/table-operations.rst
+++ b/docs/source/examples/v3arch/twisted/manager/cmdgen/table-operations.rst
@@ -4,13 +4,15 @@
 SNMP conceptual table operations
 --------------------------------
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/pull-subtree.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/pull-subtree.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getnext-v3-pull-subtree.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/pull-subtree.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/cmdgen/transport-tweaks.rst b/docs/source/examples/v3arch/twisted/manager/cmdgen/transport-tweaks.rst
index 332ee9c..9434b95 100644
--- a/docs/source/examples/v3arch/twisted/manager/cmdgen/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/twisted/manager/cmdgen/transport-tweaks.rst
@@ -4,24 +4,26 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/custom-timeout-and-retries.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getnext-v2c-from-specific-address.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/custom-timeout-and-retries.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/get-v2c-custom-timeout.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/send-packet-from-specific-address.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/cmdgen/walking-operations.rst b/docs/source/examples/v3arch/twisted/manager/cmdgen/walking-operations.rst
index cb8537d..f7e77e5 100644
--- a/docs/source/examples/v3arch/twisted/manager/cmdgen/walking-operations.rst
+++ b/docs/source/examples/v3arch/twisted/manager/cmdgen/walking-operations.rst
@@ -4,35 +4,26 @@
 Walking operations
 ------------------
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v1.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-multiple-oids-to-eom.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-v1.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getnext-multiple-oids-to-eom.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getnext-v1.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getnext-multiple-oids-to-eom.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py
+.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-multiple-oids-to-eom.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-multiple-oids-to-eom.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getbulk-v2c.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getbulk-multiple-oids-to-eom.py>` script.
 
 
-.. include:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py
-   :start-after: """
-   :end-before: """#
-
-.. literalinclude:: /../../examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py
-   :start-after: """#
-   :language: python
-
-:download:`Download</../../examples/v3arch/twisted/manager/cmdgen/getbulk-v3.py>` script.
-
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/ntfrcv/snmp-versions.rst b/docs/source/examples/v3arch/twisted/manager/ntfrcv/snmp-versions.rst
index cc3900c..324b579 100644
--- a/docs/source/examples/v3arch/twisted/manager/ntfrcv/snmp-versions.rst
+++ b/docs/source/examples/v3arch/twisted/manager/ntfrcv/snmp-versions.rst
@@ -4,13 +4,15 @@
 Various SNMP versions
 ---------------------
 
-.. include:: /../../examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py
+.. include:: /../../examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/ntfrcv/v3-multiple-users.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/ntfrcv/multiple-usm-users.py>` script.
 
+
+See also: :doc:`library reference </docs/contents>`.
diff --git a/docs/source/examples/v3arch/twisted/manager/ntfrcv/transport-tweaks.rst b/docs/source/examples/v3arch/twisted/manager/ntfrcv/transport-tweaks.rst
index 2db628b..8560e99 100644
--- a/docs/source/examples/v3arch/twisted/manager/ntfrcv/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/twisted/manager/ntfrcv/transport-tweaks.rst
@@ -4,13 +4,14 @@
 Transport tweaks
 ----------------
 
-.. include:: /../../examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py
+.. include:: /../../examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py
+.. literalinclude:: /../../examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/twisted/manager/ntfrcv/v2c-multiple-interfaces.py>` script.
+:download:`Download</../../examples/v3arch/twisted/manager/ntfrcv/multiple-interfaces.py>` script.
 
+See also: :doc:`library reference </docs/contents>`.