Merge with other modifications

src/bin/sage-runtests

@@ -31,7 +31,7 @@ if __name__ == "__main__":
         help='only run tests including one of the "# optional" tags listed in PKGS; '
              'if "sage" is listed, will also run the standard doctests; '
              'if "optional" is listed, will also run tests for installed optional (new-style) packages; '
-             'if "external" is listed, will also run tests for available external softwares; '
+             'if "external" is listed, will also run tests for available external software; '
              'if set to "all", then all tests will be run')
     parser.add_option("--randorder", type=int, metavar="SEED", help="randomize order of tests")
     parser.add_option("--global-iterations", "--global_iterations", type=int, default=0, help="repeat the whole testing process this many times")

src/doc/en/developer/doctesting.rst

@@ -830,13 +830,14 @@ In order to just run the tests that are marked as requiring magma, omit ``sage``
         cpu time: 0.1 seconds
         cumulative wall time: 2.0 seconds
 
-If you want Sage to detect external softwares (such as magma, latex, internet)
-automatically and run all the tests requiring those softwares, then add ``external``::
+If you want Sage to detect external software or other capabilities
+(such as magma, latex, internet) automatically and run all of the
+relevant tests, then add ``external``::
 
     $ sage -t --optional=external src/sage/rings/real_mpfr.pyx 
     Running doctests with ID 2016-03-16-14-10-21-af2ebb67.
     Using --optional=external
-    External softwares to be detected: cplex,gurobi,internet,latex,macaulay2,magma,maple,mathematica,matlab,octave,scilab
+    External software to be detected: cplex,gurobi,internet,latex,macaulay2,magma,maple,mathematica,matlab,octave,scilab
     Doctesting 1 file.
     sage -t --warn-long 28.0 src/sage/rings/real_mpfr.pyx
         [5 tests, 0.04 s]
@@ -846,7 +847,7 @@ automatically and run all the tests requiring those softwares, then add ``extern
     Total time for all tests: 0.5 seconds
         cpu time: 0.0 seconds
         cumulative wall time: 0.0 seconds
-    External softwares detected for doctesting: magma
+    External software detected for doctesting: magma
 
 To run all tests, regardless of whether they are marked optional, pass ``all`` as the ``optional`` tag::
 

src/sage/doctest/external.py

@@ -7,7 +7,7 @@
 
 AUTHORS:
 
-- Kwankyu Lee (2016-03-09) -- initial version, based on the codes by Robert Bradshaw and Nathann Cohen
+- Kwankyu Lee (2016-03-09) -- initial version, based on code by Robert Bradshaw and Nathann Cohen
 """
 
 #*****************************************************************************
@@ -261,7 +261,7 @@ class AvailableSoftware(object):
 
     EXAMPLES::
 
-        sage: from sage.doctest.external import external_software,available_software
+        sage: from sage.doctest.external import external_software, available_software
         sage: external_software
         ['cplex',
          'gurobi',