Resolved merging conflicts in three files

doc/utils/sphinx-config/conf.py.in

@@ -38,7 +38,7 @@ sys.path.append(os.path.join(LAMMPS_DOC_DIR, 'src', '_ext'))
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '5.2.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -53,10 +53,6 @@ extensions = [
     'tab_or_note',
     'breathe',
 ]
-# 2017-12-07: commented out, since this package is broken with Sphinx 16.x
-#             yet we can no longer use Sphinx 15.x, since that breaks with
-#             newer version of the multiprocessor module.
-#    'sphinxcontrib.images',
 
 images_config = {
   'default_image_width' : '25%',
@@ -413,9 +409,9 @@ at Sandia National Laboratories, a US Department of Energy facility,
 with funding from the DOE.  It is an open-source code, distributed
 freely under the terms of the GNU Public License (GPL).
 
-The primary author of the code is Steve Plimpton, who can be emailed
-at sjplimp@sandia.gov.  The LAMMPS WWW Site at www.lammps.org has
-more information about the code and its uses.
+The LAMMPS developers can be contacted at developers@lammps.org.
+The LAMMPS WWW Site at www.lammps.org has more information about
+the code and its uses.
 """
 
 epub_author = 'The LAMMPS Developers'

doc/utils/sphinx-config/false_positives.txt

@@ -2540,7 +2540,6 @@ oneAPI
 onelevel
 oneway
 onlysalt
-onn
 ons
 OO
 Oord
@@ -2738,6 +2737,7 @@ Polym
 polymorph
 polymorphism
 Ponder
+Ponte
 popen
 Popoola
 Popov
@@ -3692,6 +3692,7 @@ vdw
 vdW
 vdwl
 vec
+Vecchio
 vectorial
 vectorization
 Vectorization