Merge pull request #3529 from mrmundt/ampl-links

Preemptively fix 404 AMPL links

Author: mrmundt

pyomo/contrib/gjh/getGJH.py

@@ -18,7 +18,7 @@
 logger = logging.getLogger('pyomo.common')
 
 # These URLs were retrieved from
-#     https://ampl.com/resources/hooking-your-solver-to-ampl/
+#     https://dev.ampl.com/more/reports.html#hooking-solvers-to-ampl
 # All 32-bit downloads are used - 64-bit is available only for Linux
 urlmap = {
     'linux': 'https://netlib.org/ampl/student/linux/gjh.gz',

pyomo/core/base/external.py

@@ -128,8 +128,7 @@ def gradient_or_hessian(args, fixed=None): List[float]
         **ASL function libraries** (:class:`AMPLExternalFunction` interface)
 
         Pyomo can also call functions compiled as part of an AMPL
-        External Function library (see the `User-defined functions
-        <https://www.ampl.com/REFS/HOOKING/#userdefinedfuncs>`_ section
+        External Function library (see the `Imported functions` section
         in the `Hooking your solver to AMPL
         <https://www.ampl.com/REFS/hooking3.pdf>`_ report).  Links to
         these functions are declared by creating an