Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177

1 files changed, 3 insertions, 3 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 6af47f0ed3e..c5e747ff6d2 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1370,7 +1370,7 @@ getenv_internal (var, varlen, value, valuelen)
 DEFUN ("getenv-internal", Fgetenv_internal, Sgetenv_internal, 1, 1, 0,
        doc: /* Return the value of environment variable VAR, as a string.
 VAR should be a string.  Value is nil if VAR is undefined in the environment.
-This function consults the variable ``process-environment'' for its value.  */)
+This function consults the variable `process-environment' for its value.  */)
      (var)
      Lisp_Object var;
 {
@@ -1580,12 +1580,12 @@ These are files intended for Emacs to use while it runs.  */);
 
   DEFVAR_LISP ("doc-directory", &Vdoc_directory,
                doc: /* Directory containing the DOC file that comes with GNU Emacs.
-This is usually the same as data-directory.  */);
+This is usually the same as `data-directory'.  */);
 
   DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory,
                doc: /* For internal use by the build procedure only.
 This is the name of the directory in which the build procedure installed
-Emacs's info files; the default value for Info-default-directory-list
+Emacs's info files; the default value for `Info-default-directory-list'
 includes this.  */);
   Vconfigure_info_directory = build_string (PATH_INFO);