Fix a few more paths

src/sage/misc/latex_macros.py

@@ -40,9 +40,9 @@
 define the field with four elements in Sage, you also need to specify
 the name of a generator.)
 
-To see evidence of the results of the code here, run ``sage -docbuild
+To see evidence of the results of the code here, run ``sage --docbuild
 tutorial latex`` (for example), and look at the resulting LaTeX file in
-``SAGE_DOC/output/latex/en/tutorial/``.  The preamble should
+``SAGE_DOC_OUTPUT/latex/en/tutorial/``.  The preamble should
 contain '\newcommand' lines for each of the entries in ``macros``.
 """
 
@@ -146,10 +146,10 @@ def convert_latex_macro_to_mathjax(macro):
 # form [name, arguments], which will be passed to the function
 # produce_latex_macro: see that for more documentation.
 #
-# To see the results of this, run 'sage -docbuild tutorial latex' (for
+# To see the results of this, run 'sage --docbuild tutorial latex' (for
 # example -- you could replace 'tutorial' with your favorite piece of
 # documentation), and look at the resulting tex file in
-# SAGE_DOC/output/latex/en/tutorial.  The preamble should contain
+# SAGE_DOC_OUTPUT/latex/en/tutorial.  The preamble should contain
 # \newcommand's for each of the entries here.
 macros = [["ZZ"],
           ["NN"],

src/sage_setup/docbuild/__init__.py

@@ -91,22 +91,12 @@ def f(self, *args, **kwds):
             if ABORT_ON_ERROR:
                 raise
 
-        # Print message about location of output:
-        #   - by default if html output
-        #   - if verbose and if not pdf output
-        #   - if pdf: print custom message here if verbose, and print
-        #     full message below (see pdf method) after 'make all-pdf'
-        #     is done running
-
-        if 'output/html' in output_dir:
-            logger.warning("Build finished. The built documents can be found in %s",
-                           output_dir)
-        elif 'output/pdf' not in output_dir:
-            logger.info("Build finished. The built documents can be found in %s",
-                           output_dir)
+        if "/latex" in output_dir:
+            logger.warning("LaTeX file written to {}".format(output_dir))
         else:
-            logger.info("LaTeX file written to %s; now making PDF.",
-                           output_dir)
+            logger.warning(
+                "Build finished.  The built documents can be found in {}".
+                format(output_dir))
 
     f.is_output_format = True
     return f
@@ -379,7 +369,7 @@ def create_html_redirects(self):
             document_name = document.split('/')[1]
 
             # the sage directory within a subdocument, for example
-            # /path/to/.../output/html/en/reference/algebras/sage
+            # local/share/doc/sage/html/en/reference/algebras/sage
             sage_directory = os.path.join(path, document, 'sage')
 
             # Walk through all of the files in the sage_directory
@@ -511,7 +501,7 @@ def _wrapper(self, format, *args, **kwds):
                 # few seconds.)
                 getattr(get_builder('website'), 'html')()
                 # Copy the relevant pieces of
-                # output/html/en/website/_static to output_dir.
+                # SAGE_DOC_OUTPUT/html/en/website/_static to output_dir.
                 # (Don't copy all of _static to save some space: we
                 # don't need all of the MathJax stuff, and in
                 # particular we don't need the fonts.)