Merge branch 'develop' into type-labels

# Conflicts:
#	doc/src/dihedral_coeff.rst

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

@@ -385,7 +385,7 @@ from sphinx.highlighting import lexers
 
 lexers['LAMMPS'] = LAMMPSLexer.LAMMPSLexer(startinline=True)
 
-sys.path.append(LAMMPS_PYTHON_DIR)
+sys.path.insert(1,LAMMPS_PYTHON_DIR)
 
 # avoid syntax highlighting in blocks that don't specify language
 highlight_language = 'none'

doc/utils/sphinx-config/false_positives.txt

@@ -258,6 +258,7 @@ Bfrac
 bgq
 Bh
 Bialke
+biaxial
 bicrystal
 Biersack
 bigbig
@@ -306,7 +307,6 @@ Bogaerts
 Bogusz
 Bohrs
 boltz
-Boltzman
 BondAngle
 BondBond
 bondchk
@@ -977,6 +977,7 @@ Eshelby
 eskm
 Espanol
 esph
+espin
 estretch
 esu
 esub
@@ -2257,6 +2258,7 @@ nanoparticles
 nanotube
 Nanotube
 nanotubes
+nanowires
 Narulkar
 nasa
 nasr
@@ -3655,6 +3657,7 @@ Vandenbrande
 Vanduyfhuys
 varargs
 varavg
+variational
 Varshalovich
 Varshney
 vashishta