Merge remote-tracking branch 'jsiirola/solver-refactor' into solver-refactor

Author: jsiirola

doc/OnlineDocs/conf.py

@@ -57,8 +57,8 @@
     'numpy': ('https://numpy.org/doc/stable/', None),
     'pandas': ('https://pandas.pydata.org/docs/', None),
     'scikit-learn': ('https://scikit-learn.org/stable/', None),
-    'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None),
-    'Sphinx': ('https://www.sphinx-doc.org/en/stable/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/', None),
+    'Sphinx': ('https://www.sphinx-doc.org/en/master/', None),
 }
 
 # -- General configuration ------------------------------------------------

doc/OnlineDocs/library_reference/expressions/context_managers.rst

@@ -8,6 +8,3 @@ Context Managers
 .. autoclass:: pyomo.core.expr.linear_expression
     :members:
 
-.. autoclass:: pyomo.core.expr.current.clone_counter
-    :members:
-