Merge branch 'v2.6' into v2.7

plumed · Nov 4, 2020 · 46b2412 · 46b2412 · PlumedBot · Nov 4, 2020
2 parents 6a09292 + 7e0f0c2
commit 46b2412
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES/v2.6.md b/CHANGES/v2.6.md
@@ -64,7 +64,7 @@ For users:
   - added gromacs 2019.6 
   - added gromacs 2020.2 (experimental) 
 - Fixed handling of truncated octahedron box in Amber (see \issue{584}).
-  Notice that the fix is for the PMEMD pactch to be used with Amber 18.
+  Notice that the fix is for the PMEMD patch to be used with Amber 18.
   Amber 20 has been fixed upstream, both in PMEMD and Sander code.
 
 For developers:

diff --git a/user-doc/spelling_words.dict b/user-doc/spelling_words.dict
@@ -531,6 +531,7 @@ lplumed
 dl
 progname
 openmm
+OpenMM
 erm
 arse
 autocompletion
@@ -1040,6 +1041,7 @@ AdaGrad
 fesA
 ann
 dlb
+octahedron
 Stefano
 Raniolo
 Vittorio