Merge branch 'master' into fabric

doc/utils/sphinx-config/_themes/lammps_theme/breadcrumbs.html

@@ -65,7 +65,7 @@
           {% elif show_source and has_source and sourcename %}
             <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
           {% endif %}
-          <a href="http://lammps.sandia.gov">Website</a>
+          <a href="https://www.lammps.org">Website</a>
           <a href="Commands_all.html">Commands</a>
         {% endif %}
       </li>

doc/utils/sphinx-config/_themes/lammps_theme/layout.html

@@ -38,10 +38,11 @@
   {% if favicon %}
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
   {% endif %}
-  {# CANONICAL URL #}
-  {% if theme_canonical_url %}
-    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
-  {% endif %}
+
+  {#- CANONICAL URL #}
+  {%- if pageurl %}
+    <link rel="canonical" href="{{ pageurl|e }}" />
+  {%- endif -%}
 
   {# JAVASCRIPTS #}
   {%- block scripts %}

doc/utils/sphinx-config/_themes/lammps_theme/theme.conf

@@ -4,7 +4,6 @@ stylesheet = css/theme.css
 pygments_style = default
 
 [options]
-canonical_url =
 analytics_id =
 collapse_navigation = False
 sticky_navigation = False

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

@@ -15,6 +15,7 @@
 
 import sys
 import os
+from datetime import date
 
 has_enchant = False
 try:
@@ -76,7 +77,7 @@ master_doc = 'Manual'
 
 # General information about the project.
 project = 'LAMMPS'
-copyright = '2003-2020 Sandia Corporation'
+copyright = '2003-{} Sandia Corporation'.format(date.today().year)
 
 def get_lammps_version():
     import os
@@ -255,6 +256,8 @@ htmlhelp_basename = 'LAMMPSdoc'
 
 html_permalinks = True
 
+html_baseurl = os.environ.get('LAMMPS_WEBSITE_BASEURL', '')
+
 if 'epub' in sys.argv:
   html_math_renderer = 'imgmath'
 else:

doc/utils/sphinx-config/false_positives.txt

@@ -188,6 +188,7 @@ Babaei
 backcolor
 backends
 Baczewski
+Bagchi
 Bagi
 Bagnold
 Bajaj
@@ -201,6 +202,7 @@ Ballenegger
 Bammann
 Banna
 Barashev
+Barbosa
 barnes
 barostat
 Barostats
@@ -208,6 +210,7 @@ barostatted
 barostatting
 Barostatting
 Barrat
+Barros
 Bartelt
 Bartels
 barycenter
@@ -225,6 +228,7 @@ bdw
 Beckman
 Belak
 Bellott
+bem
 benchmarking
 Bennet
 Berardi
@@ -1156,6 +1160,7 @@ gmake
 gmask
 Gmask
 GMock
+gmres
 gneb
 GNEB
 Goldfarb
@@ -1461,6 +1466,7 @@ Izvekov
 izz
 Izz
 Jacobsen
+Jadhao
 Jadhav
 jagreat
 Jahn
@@ -1516,6 +1522,7 @@ Kadiri
 Kai
 Kalia
 Kamberaj
+Kantorovich
 Kapfer
 Karls
 Karlsruhe
@@ -2356,6 +2363,7 @@ Oleinik
 Olfason
 olivedrab
 Ollila
+Olvera
 omegaDD
 omegax
 omegay
@@ -2631,7 +2639,6 @@ PyLammps
 pymbar
 pymodule
 pymol
-pypar
 pythonic
 pytorch
 pyy
@@ -2990,6 +2997,7 @@ Sim
 Simov
 Simul
 simulations
+Sinkovits
 Sinnott
 sinusoid
 sinusoidally
@@ -3140,6 +3148,7 @@ surfactant
 surfactants
 Suter
 Sutmann
+Suzen
 svn
 sw
 Swegat
@@ -3341,6 +3350,7 @@ twobody
 twojmax
 Tx
 txt
+Tyagi
 typeI
 typeJ
 typeN