Merge branch 'develop' into distributed-grids

# Conflicts:
#	doc/src/Developer_utils.rst
#	doc/src/dump.rst
#	doc/src/fix_ave_chunk.rst
#	src/utils.h

doc/utils/sphinx-config/LAMMPSLexer.py

@@ -6,7 +6,7 @@ LAMMPS_COMMANDS = ("angle_coeff", "angle_style", "atom_modify", "atom_style",
 "clear", "comm_modify", "comm_style",
 "compute_modify", "create_atoms", "create_bonds", "create_box", "delete_atoms",
 "delete_bonds", "dielectric", "dihedral_coeff", "dihedral_style", "dimension",
-"displace_atoms", "dump_modify", "dynamical_matrix", "echo",
+"displace_atoms", "dump_modify", "dynamical_matrix", "echo", "elif", "else",
 "fix_modify", "group2ndx", "hyper", "if", "improper_coeff",
 "improper_style", "include", "info", "jump", "kim",
 "kspace_modify", "kspace_style", "label", "lattice",
@@ -16,8 +16,8 @@ LAMMPS_COMMANDS = ("angle_coeff", "angle_style", "atom_modify", "atom_style",
 "partition", "prd", "print", "processors", "python", "quit", "read_data",
 "read_dump", "read_restart", "replicate", "rerun", "reset_ids",
 "reset_timestep", "restart", "run", "run_style", "server", "set", "shell",
-"special_bonds", "suffix", "tad", "temper", "temper/grem", "temper/npt",
-"thermo", "thermo_modify", "thermo_style", "then", "third_order", "timer", "timestep",
+"special_bonds", "suffix", "tad", "temper", "temper/grem", "temper/npt", "then",
+"thermo", "thermo_modify", "thermo_style", "third_order", "timer", "timestep",
 "units", "velocity", "write_coeff",
 "write_data", "write_restart")
 

doc/utils/sphinx-config/false_positives.txt

@@ -61,6 +61,7 @@ ajs
 akohlmey
 Aktulga
 al
+alabel
 alain
 Alain
 Alamos
@@ -287,6 +288,7 @@ bitrates
 Bitzek
 Bjerrum
 Bkappa
+blabel
 Blaise
 blanchedalmond
 blocksize
@@ -750,6 +752,7 @@ dissipative
 Dissipative
 distharm
 dl
+dlabel
 dlambda
 DLAMMPS
 dll
@@ -1427,6 +1430,7 @@ ijk
 ijkl
 ik
 Ikeshoji
+ilabel
 Ilie
 ilmenau
 Ilmenau
@@ -1716,6 +1720,8 @@ Kusters
 Kutta
 Kuznetsov
 kx
+labelmap
+Labelmap
 Lachet
 Lackmann
 Ladd
@@ -1939,6 +1945,8 @@ Manolopoulos
 manpages
 manybody
 MANYBODY
+mapID
+mapIDs
 Maras
 Marchetti
 Marchi
@@ -2252,6 +2260,7 @@ nanoparticles
 nanotube
 Nanotube
 nanotubes
+nanowires
 Narulkar
 nasa
 nasr
@@ -2259,6 +2268,7 @@ natively
 Natoli
 natoms
 Natoms
+Natomtype
 Nattempt
 navajowhite
 Navier
@@ -3555,6 +3565,7 @@ typeargs
 typedefs
 typeI
 typeJ
+typelabel
 typeN
 typesafe
 Tz