소스 검색

Merge branch 'maint'

Kyle Meyer 9 년 전
부모
커밋
4f499fff96
2개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 1
      doc/org.texi
  2. 2 1
      lisp/org-capture.el

+ 3 - 1
doc/org.texi

@@ -7151,7 +7151,9 @@ files, targets usually define a node.  Entries will become children of this
 node.  Other types will be added to the table or list in the body of this
 node.  Most target specifications contain a file name.  If that file name is
 the empty string, it defaults to @code{org-default-notes-file}.  A file can
-also be given as a variable, function, or Emacs Lisp form.
+also be given as a variable, function, or Emacs Lisp form.  When an absolute
+path is not specified for a target, it is taken as relative to
+@code{org-directory}.
 
 Valid values are:
 

+ 2 - 1
lisp/org-capture.el

@@ -127,7 +127,8 @@ target       Specification of where the captured item should be placed.
              Most target specifications contain a file name.  If that file
              name is the empty string, it defaults to `org-default-notes-file'.
              A file can also be given as a variable, function, or Emacs Lisp
-             form.
+             form.  When an absolute path is not specified for a
+             target, it is taken as relative to `org-directory'.
 
              Valid values are: