Merge pull request #141 from ceball/option_group

Group nbval command line options under 'nbval'.

Author: vidartf

README.md

@@ -115,8 +115,8 @@ notebook are run on the same kernel.
 ## Help
 The `py.test` system help can be obtained with `py.test -h`, which will
 show all the flags that can be passed to the command, such as the
-verbose `-v` option. The IPython notebook plugin can be found under the
-`general` section.
+verbose `-v` option. Nbval's options can be found under the
+`Jupyter Notebook validation` section.
 
 
 ## Acknowledgements

nbval/plugin.py

@@ -65,9 +65,10 @@ def pytest_addoption(parser):
 
     This is called by the pytest API
     """
-    group = parser.getgroup("general")
+    group = parser.getgroup("nbval", "Jupyter Notebook validation")
+
     group.addoption('--nbval', action='store_true',
-                    help="Validate Jupyter notebooks")
+                    help="Run Jupyter notebooks, validating all output")
 
     group.addoption('--nbval-lax', action='store_true',
                     help="Run Jupyter notebooks, only validating output on "