Browse Source

docstring edits

* lisp/ob.el (org-babel-merge-params): docstring typo
Dan Davison 14 years ago
parent
commit
dcfeec887a
2 changed files with 3 additions and 2 deletions
  1. 2 1
      lisp/ob-python.el
  2. 1 1
      lisp/ob.el

+ 2 - 1
lisp/ob-python.el

@@ -46,7 +46,8 @@
   "Name of command for executing python code.")
 
 (defvar org-babel-python-mode (if (featurep 'xemacs) 'python-mode 'python)
-  "Preferred python mode for use in running python interactively.")
+  "Preferred python mode for use in running python interactively.
+This will typically be either 'python or 'python-mode.")
 
 (defvar org-src-preserve-indentation)
 

+ 1 - 1
lisp/ob.el

@@ -1601,7 +1601,7 @@ file's directory then expand relative links."
 
 (defun org-babel-merge-params (&rest plists)
   "Combine all parameter association lists in PLISTS.
-Later elements of PLISTS override the values of previous element.
+Later elements of PLISTS override the values of previous elements.
 This takes into account some special considerations for certain
 parameters when merging lists."
   (let ((results-exclusive-groups