diff --git a/Doc/lib/libstdtypes.tex b/Doc/lib/libstdtypes.tex
index 6e38222..179503d 100644
--- a/Doc/lib/libstdtypes.tex
+++ b/Doc/lib/libstdtypes.tex
@@ -1556,8 +1556,9 @@
 \end{memberdesc}
 
 \begin{memberdesc}[file]{newlines}
-If Python was built with the \code{--with-universal-newlines} option
-(the default) this read-only attribute exists, and for files opened in
+If Python was built with the \longprogramopt{with-universal-newlines}
+option to \program{configure} (the default) this read-only attribute
+exists, and for files opened in
 universal newline read mode it keeps track of the types of newlines
 encountered while reading the file. The values it can take are
 \code{'\e r'}, \code{'\e n'}, \code{'\e r\e n'}, \code{None} (unknown,
diff --git a/Doc/whatsnew/whatsnew20.tex b/Doc/whatsnew/whatsnew20.tex
index 1728e1a..11337ee 100644
--- a/Doc/whatsnew/whatsnew20.tex
+++ b/Doc/whatsnew/whatsnew20.tex
@@ -525,8 +525,8 @@
 destroys objects.  The detection of cycles can be disabled when Python
 is compiled, if you can't afford even a tiny speed penalty or suspect
 that the cycle collection is buggy, by specifying the
-\samp{--without-cycle-gc} switch when running the \file{configure}
-script.
+\longprogramopt{without-cycle-gc} switch when running the
+\program{configure} script.
 
 Several people tackled this problem and contributed to a solution.  An
 early implementation of the cycle detection approach was written by