migrated references from SourceForge (#110)

13 files changed, 26 insertions, 24 deletions

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 59c6d764..19383d4e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -312,7 +312,8 @@ texinfo_documents = [
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3.4/', None),
-    'pysmi': ('http://pysmi.sf.net/', None),
+    'pyasn1': ('http://snmplabs.com/pyasn1/', None),
+    'pysmi': ('http://snmplabs.com/pysmi/', None),
     'twisted': ('https://twistedmatrix.com/documents/15.4.0/api/', None)
 }
 
diff --git a/docs/source/development.rst b/docs/source/development.rst
index 56175947..920b0ad9 100644
--- a/docs/source/development.rst
+++ b/docs/source/development.rst
@@ -21,7 +21,7 @@ PySNMP library
    be to write another MIB parser and code generator which would produce
    PySNMP compliant Python code right from MIB text files all by itself.
 
-   **Done:** see `PySMI project <http://pysmi.sf.net>`_ in conjuction with the latest PySNMP codebase.
+   **Done:** see `PySMI project <http://snmplabs.com/pysmi/>`_ in conjuction with the latest PySNMP codebase.
 
 #. Reverse MIB index. The variable-bindings received by the system whilst 
    in Manager role could be post-processed using the information kept in 
@@ -63,7 +63,7 @@ Stand-alone PySNMP-based tools
    include extensive configuration facilities, fine-graned access 
    control and logging.
 
-   **Done:** see `SNMP Proxy Forwarder <http://snmpfwd.sf.net>`_.
+   **Done:** see `SNMP Proxy Forwarder <http://snmplabs.com/snmpfwd/>`_.
 
 #. SNMP Trap Receiver. We see this application as a simple yet flexible 
    SNMP TRAP collector. It would listen on network sockets of different 
@@ -81,10 +81,10 @@ Stand-alone PySNMP-based tools
    a relational database application. So we are planning to put some more 
    efforts into the Simulator project as time permits. 
 
-   **Done:** since `snmpsim-0.2.4 <http://snmpsim.sf.net>`_ 
+   **Done:** since `snmpsim-0.2.4 <http://snmplabs.com/snmpsim/>`_ 
 
 If you need some particular feature - please, 
-`drop us a note <http://pysnmp.sourceforge.net/contact.html>`_ . Once we 
+`open a feature request <https://github.com/etingof/pysnmp/issues/new>`_ . Once we 
 see a greater demand in particular area, we would re-arrange our 
 development resources to meet it sooner. 
 
@@ -95,5 +95,5 @@ Contributions to the PySNMP source code is greatly appreciated as well.
 We require contributed code to run with Python 2.4 through the latest 
 Python version (which is 3.6 at the time of this writing). Contributed
 code will be redistributed under the terms of the same 
-`license <http://pysnmp.sourceforge.net/license.html>`_ as PySNMP is.
+`license <http://snmplabs.com/pysnmp/>`_ as PySNMP is.
 
diff --git a/docs/source/docs/api-reference.rst b/docs/source/docs/api-reference.rst
index 7f67fb0c..8ff7d958 100644
--- a/docs/source/docs/api-reference.rst
+++ b/docs/source/docs/api-reference.rst
@@ -329,7 +329,7 @@ states in form of values. Those values each belong to one
 of SNMP types (:RFC:`1902#section-2`) which, in turn, are based
 on `ASN.1 <https://en.wikipedia.org/wiki/Abstract_Syntax_Notation_One>`_ 
 data description language. PySNMP types are derived from
-`Python ASN.1 types <http://pyasn1.sf.net>`_ implementation.
+`Python ASN.1 types <http://snmplabs.com/pyasn1/>`_ implementation.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/source/docs/pysnmp-hlapi-tutorial.rst b/docs/source/docs/pysnmp-hlapi-tutorial.rst
index 2aea0fa4..54bb6e5e 100644
--- a/docs/source/docs/pysnmp-hlapi-tutorial.rst
+++ b/docs/source/docs/pysnmp-hlapi-tutorial.rst
@@ -100,7 +100,7 @@ Setting transport and target
 
 PySNMP supports UDP-over-IPv4 and UDP-over-IPv6 network transports.
 In this example we will query 
-`public SNMP Simulator <http://snmpsim.sourceforge.net/public-snmp-simulator.html>`_
+`public SNMP Simulator <http://snmplabs.com/snmpsim/public-snmp-simulator.html>`_
 available over IPv4 on the Internet at *demo.snmplabs.com*. Transport
 configuration is passed to SNMP LCD in form of properly initialized
 :py:class:`~pysnmp.hlapi.UdpTransportTarget` or
diff --git a/docs/source/docs/snmp-design.rst b/docs/source/docs/snmp-design.rst
index de349bf8..2752a918 100644
--- a/docs/source/docs/snmp-design.rst
+++ b/docs/source/docs/snmp-design.rst
@@ -98,7 +98,7 @@ SNMP-specific subtypes of those base ASN.1 types are:
 In addition to these scalar types, SNMP defines a way to collect them
 into ordered arrays. From these arrays 2-d tables could be built.
 
-PySNMP relies on the `PyASN1 <http://pyasn1.sf.net/>`_ package for
+PySNMP relies on the `PyASN1 <http://snmplabs.com/pyasn1/>`_ package for
 modeling all SNMP types.  With PyASN1, instances of ASN.1 types are
 represented by Python objects that look like either a string or an
 integer. 
@@ -229,7 +229,7 @@ managing entities.
 
 MIB convertion is performed automatically by PySNMP, but technically,
 it is handled by PySNMP sister project called
-`PySMI <http://pysmi.sf.net>`_. However you can also perform said
+`PySMI <http://snmplabs.com/pysmi/>`_. However you can also perform said
 conversion by hand with PySMI's *mibdump.py* tool.
 
 Protocol operations
diff --git a/docs/source/download.rst b/docs/source/download.rst
index a0f43005..69413e4a 100644
--- a/docs/source/download.rst
+++ b/docs/source/download.rst
@@ -5,9 +5,10 @@ Download PySNMP
    :maxdepth: 2
 
 The PySNMP software is provided under terms and conditions of BSD-style 
-license, and can be freely downloaded from Source Forge
-`download servers <http://sourceforge.net/projects/pysnmp/files/>`_ or 
-`PyPI <http://pypi.python.org/pypi/pysnmp/>`_. 
+license, and can be freely downloaded from 
+`PyPI <http://pypi.python.org/pypi/pysnmp/>`_ or
+GitHub (`master branch <https://github.com/etingof/pysnmp/archive/master.zip>`_).
+
 
 Besides official releases, it's advisable to try the cutting-edge
 development code that could be taken from PySNMP
@@ -66,6 +67,6 @@ The installation procedure for all the above packages is as follows
    # cd .. 
    # rm -rf package-X.X.X
 
-In case of any issues, please `let us know <http://pysnmp.sourceforge.net/contact.html>`_ so we could try to help out.
+In case of any issues, please open a `GitHub issue <https://github.com/etingof/pysnmp/issues/new>`_ so we could try to help out.
 
 
diff --git a/docs/source/examples/contents.rst b/docs/source/examples/contents.rst
index 3e7b3522..f179e13b 100644
--- a/docs/source/examples/contents.rst
+++ b/docs/source/examples/contents.rst
@@ -136,7 +136,7 @@ easy_install: ::
 
 There's a public, multilingual SNMP Command Responder and Notification
 Receiver configured at
-`demo.snmplabs.com <http://snmpsim.sourceforge.net/public-snmp-simulator.html>`_ to let you run PySNMP examples scripts in a cut&paste fashion. If you
+`demo.snmplabs.com <http://snmplabs.com/snmpsim/public-snmp-simulator.html>`_ to let you run PySNMP examples scripts in a cut&paste fashion. If you
 wish to use your own SNMP Agent with these scripts, make sure to either
 configure your local snmpd and/or snmptrapd or use a valid address and
 SNMP credentials of your SNMP Agent in the examples to let them work.
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
index 18ce9670..8167d415 100644
--- a/docs/source/faq.rst
+++ b/docs/source/faq.rst
@@ -4,7 +4,7 @@ FAQ
 
 Here we have an ever-growing list of frequently asked questions regarding
 PySNMP usage issues. If you got an issue that you think is worth noting
-here, please `drop us a note <http://pysnmp.sourceforge.net/contact.html>`_.
+here, please open a `GitHub issue <https://github.com/etingof/pysnmp/issues>`_.
 
 Keep in mind that some the answers below may not be universally applicable
 to any PySNMP revision.
diff --git a/docs/source/faq/non-printable-snmp-values-apps.rst b/docs/source/faq/non-printable-snmp-values-apps.rst
index 9b8fa19a..e9a3e3f3 100644
--- a/docs/source/faq/non-printable-snmp-values-apps.rst
+++ b/docs/source/faq/non-printable-snmp-values-apps.rst
@@ -35,6 +35,6 @@ A. Always use prettyPrint() method for all pyasn1-based objects -- it
     > > > rfc1902.IpAddress.prettyPrint(a)
     '1.2.3.4'
 
-See `pyasn1 tutorial <http://pyasn1.sourceforge.net/>`_ for more information
+See `pyasn1 docs <http://snmplabs.com/pyasn1/>`_ for more information
 on pyasn1 data model.
 
diff --git a/docs/source/faq/non-printable-snmp-values-tools.rst b/docs/source/faq/non-printable-snmp-values-tools.rst
index 475a9f26..a11939d4 100644
--- a/docs/source/faq/non-printable-snmp-values-tools.rst
+++ b/docs/source/faq/non-printable-snmp-values-tools.rst
@@ -1,4 +1,4 @@
-  
+
 Garbaged SNMP values (tools)
 ----------------------------
 
diff --git a/docs/source/faq/pass-custom-mib-to-manager.rst b/docs/source/faq/pass-custom-mib-to-manager.rst
index d1f5ac90..a83e9307 100644
--- a/docs/source/faq/pass-custom-mib-to-manager.rst
+++ b/docs/source/faq/pass-custom-mib-to-manager.rst
@@ -6,7 +6,7 @@ Q. How to make use of random MIBs at my Manager application?
 
 A. Starting from PySNMP 4.3.x, plain-text (ASN.1) MIBs can be
    automatically parsed into PySNMP form by the
-   `PySMI <http://pysmi.sf.net>`_ tool.  PySNMP will call PySMI
+   `PySMI <http://snmplabs.com/pysmi/>`_ tool.  PySNMP will call PySMI
    automatically, parsed PySNMP MIB will be cached in
    $HOME/.pysnmp/mibs/ (default location).
 
@@ -24,6 +24,6 @@ A. Starting from PySNMP 4.3.x, plain-text (ASN.1) MIBs can be
 :download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/custom-asn1-mib-search-path.py>` script.
 
 Alternatively, you can invoke the
-`mibdump.py <http://pysmi.sourceforge.net/user-perspective.html>`_
+`mibdump.py <http://snmplabs.com/pysmi/mibdump.html>`_
 (shipped with PySMI) by hand and this way compile plain-text MIB
 into PySNMP format.
diff --git a/docs/source/oldsite.rst b/docs/source/oldsite.rst
index dfb4694f..a91dde44 100644
--- a/docs/source/oldsite.rst
+++ b/docs/source/oldsite.rst
@@ -4,7 +4,7 @@ Old site archive
 
 Starting from PySNMP 4.3.0, we redesigned all documentation and web-site.
 For previous versions of those please follow these links for
-`old examples <http://pysnmp.sf.net/examples/current/index.html>`_
+`old examples <http://snmplabs.com/pysnmp/examples/current/index.html>`_
 and
-`old documentation <http://pysnmp.sf.net/docs/current/index.html>`_
+`old documentation <http://snmplabs.com/pysnmp/docs/current/index.html>`_
 .
diff --git a/docs/source/quick-start.rst b/docs/source/quick-start.rst
index 29af4ede..73040e4c 100644
--- a/docs/source/quick-start.rst
+++ b/docs/source/quick-start.rst
@@ -16,7 +16,7 @@ Fetch SNMP variable
 So just cut&paste the following code right into your Python prompt. The 
 code will performs SNMP GET operation for a sysDescr.0 object at a 
 publically available SNMP Command Responder at
-`demo.snmplabs.com <http://snmpsim.sourceforge.net/public-snmp-simulator.html>`_:
+`demo.snmplabs.com <http://snmplabs.com/snmpsim/public-snmp-simulator.html>`_:
 
 .. literalinclude:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/v1-get.py
    :start-after: """#
@@ -38,7 +38,7 @@ Send SNMP TRAP
 --------------
 
 To send a trivial TRAP message to our hosted Notification Receiver at
-`demo.snmplabs.com <http://snmpsim.sourceforge.net/public-snmp-simulator.html>`_
+`demo.snmplabs.com <http://snmplabs.com/snmpsim/public-snmp-simulator.html>`_
 , just cut&paste the following code into your interactive Python session:
 
 .. literalinclude:: /../../examples/hlapi/asyncore/sync/agent/ntforg/default-v1-trap.py