Merge pull request #2645 from williamfgc/docs

> @chuckatkins I thought PRs on docs were not supposed to run the full CI anymore. I haven't quite got that worked out yet.
ornladios · Mar 10, 2021 · 8d8c90a · 8d8c90a
2 parents a604a72 + bdc2a5b
commit 8d8c90a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -55,21 +55,19 @@ If you find ADIOS2 useful, please cite our [SoftwareX paper](https://doi.org/10.
 For a `cmake` configuration example see [scripts/runconf/runconf.sh](https://github.com/ornladios/ADIOS2/blob/master/scripts/runconf/runconf.sh)
 
 
-* Conda packages: 
-* [https://anaconda.org/williamfgc](https://anaconda.org/williamfgc)
+* Conda packages:
 * [https://anaconda.org/conda-forge/adios2](https://anaconda.org/conda-forge/adios2)
 
 
 * Spack: [adios2 package](https://spack.readthedocs.io/en/latest/package_list.html#adios2)
 
 
-* Docker images: 
-* Ubuntu 18.04: under [scripts/docker/images/ubuntu18.04/Dockerfile](https://github.com/ornladios/ADIOS2/tree/master/scripts/docker/images/ubuntu18.04/Dockerfile)
+* Docker images: under [scripts/docker](https://github.com/ornladios/ADIOS2/tree/master/scripts/docker)
 
 
-Once ADIOS 2 is installed refer to: 
+Once ADIOS2 is installed refer to: 
 
-* [Linking ADIOS 2](https://adios2.readthedocs.io/en/latest/setting_up/setting_up.html#linking-adios-2)
+* [Linking ADIO 2](https://adios2.readthedocs.io/en/latest/setting_up/setting_up.html#linking-adios-2)
 
 
 ## Releases

diff --git a/docs/user_guide/source/setting_up/package.rst b/docs/user_guide/source/setting_up/package.rst
@@ -23,6 +23,5 @@ ADIOS 2 is packaged in Spack `adios2 package <https://spack.readthedocs.io/en/la
 Docker
 ******
 
-Docker images including building and installation of ADIOS 2 in a container: 
-* Ubuntu 18.04: under `scripts/docker/images/ubuntu/Dockerfile <https://github.com/ornladios/ADIOS2/tree/master/scripts/docker/images/ubuntu/Dockerfile>`_
-
+Docker images including building and installation of dependencies and ADIOS 2 containers for Ubuntu 20 and CentOS 7 can be found in: 
+under the directory `scripts/docker/ <https://github.com/ornladios/ADIOS2/tree/master/scripts/docker>`_
diff --git a/docs/user_guide/source/setting_up/source/cmake.rst b/docs/user_guide/source/setting_up/source/cmake.rst
@@ -104,7 +104,7 @@ In addition to the ``ADIOS2_USE_Feature`` options, the following options are als
 ==================================== =============================================== ===============================
 ``BUILD_SHARED_LIBS``                  **ON**/OFF                                     Build shared libraries.
 ``ADIOS2_BUILD_EXAMPLES``              **ON**/OFF                                     Build examples.
-``ADIOS2_BUILD_TESTING``               **ON**/OFF                                     Build test code.
+``BUILD_TESTING``                      **ON**/OFF                                     Build test code.
 ``CMAKE_INSTALL_PREFIX``               /path/to/install (``/usr/local``)              Installation location.
 ``CMAKE_BUILD_TYPE``                   Debug/**Release**/RelWithDebInfo/MinSizeRel    Compiler optimization levels.
 ==================================== =============================================== ===============================