Merge branch 'reset-ids-sort' into move-ubuf-to-lmptype

# Conflicts:
#	src/reset_ids.h

doc/src/reset_ids.rst

@@ -13,11 +13,11 @@ Syntax
 * zero or more keyword/value pairs may be appended
 * keyword = *sort*
 
-  .. parsed-literal::
+.. parsed-literal::
 
-        *sort* value = *yes* or *no*
+   *sort* value = *yes* or *no*
 
-   Examples
+Examples
 """"""""
 
 .. code-block:: LAMMPS

src/reset_ids.h

@@ -47,11 +47,11 @@ class ResetIDs : protected Pointers {
 
  private:
   bigint binlo,binhi;
-  
+
   // callback functions for rendezvous communication
 
   static int sort_bins(int, char *, int &, int *&, char *&, void *);
-  
+
   void sort();
 };