Merge branch 'maint'

contrib/lisp/org-index.el

@@ -69,7 +69,7 @@
 ;;
 ;;  The latest tested version of this file can always be found at:
 ;;
-;;    http://orgmode.org/w/org-mode.git?p=org-mode.git;a=blob_plain;f=contrib/lisp/org-index.el;hb=HEAD
+;;    http://orgmode.org/cgit.cgi/org-mode.git/plain/contrib/lisp/org-index.el
 
 ;;; Change Log:
 

contrib/scripts/org-docco.org

@@ -5,7 +5,7 @@
 
 The =docco= tool (see http://jashkenas.github.com/docco/) generates
 HTML from JavaScript source code providing an attractive side-by-side
-display of source code and comments.  This file (see [[http://orgmode.org/w/?p=org-mode.git;a=blob_plain;f=contrib/scripts/org-docco.org;hb=HEAD][org-docco.org]])
+display of source code and comments.  This file (see [[http://orgmode.org/cgit.cgi/org-mode.git/plain/contrib/scripts/org-docco.org][org-docco.org]])
 generates the same type of output from Org-mode documents with code
 embedded in code blocks.
 

etc/ORG-NEWS

@@ -1,7 +1,7 @@
 ORG NEWS -- history of user-visible changes.           -*- org -*-
 
 #+LINK: doc http://orgmode.org/worg/doc.html#%s
-#+LINK: git http://orgmode.org/w/?p=org-mode.git;a=commit;h=%s
+#+LINK: git http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=%s
 
 Copyright (C) 2012-2015 Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -36,7 +36,7 @@ The following function will repair them:
 #+BEGIN_SRC emacs-lisp
 (defun org-repair-property-drawers ()
   "Fix properties drawers in current buffer.
- Ignore non Org buffers."
+Ignore non Org buffers."
   (when (eq major-mode 'org-mode)
     (org-with-wide-buffer
      (goto-char (point-min))
@@ -62,7 +62,18 @@ The following function will repair them:
                            (match-beginning 0)
                            (min (1+ (match-end 0)) end)))
                   (unless (bolp) (insert "\n"))))))))))))
-#+END_SRC 
+#+END_SRC
+
+*** Using "COMMENT" is now equivalent to commenting with "#"
+
+If you used "COMMENT" in headlines to prevent a subtree from being
+exported, you can still do it but all information within the subtree
+is now commented out, i.e. no #+OPTIONS line will be parsed or taken
+into account when exporting.
+
+If you want to exclude a headline from export while using its contents
+for setting options, use =org-export-exclude-tags= instead.
+
 *** =#+CATEGORY= keywords no longer apply partially to document
 
 It was possible to use several such keywords and have them apply to
@@ -78,12 +89,13 @@ properties to set category for a subtree, e.g.,
    :CATEGORY: some category
    :END:
 #+END_SRC
+
 *** New variable to control visibility when revealing a location
 
-~org-show-following-heading~, ~org-show-siblings~,
-~org-show-entry-below~ and ~org-show-hierarchy-above~ no longer exist.
-Instead, visibility is controlled through a single variable:
-~org-show-context-detail~, which see.
+~org-show-following-heading~, ~org-show-siblings~, ~org-show-entry-below~
+and ~org-show-hierarchy-above~ no longer exist.  Instead, visibility is
+controlled through a single variable: ~org-show-context-detail~, which
+see.
 
 *** Replace disputed keys again when reading a date
 
@@ -96,7 +108,26 @@ Keybinding for reading date can be customized with a new variable
 *** No default title is provided when =TITLE= keyword is missing
 
 Skipping =TITLE= keyword no longer provides the current file name, or
-buffer name, as the title. Instead, simply ignore the title.
+buffer name, as the title.  Instead, simply ignore the title.
+
+*** Default bindings of =C-c C-n= and =C-c C-p= changed
+
+The key sequences =C-c C-n= and =C-c C-p= are now bound to
+~org-next-visible-heading~ and ~org-next-visible-heading~ respectively,
+rather than the =outline-mode= versions of these functions.  The Org
+version of these functions skips over inline tasks (and even-level
+headlines when ~org-odd-levels-only~ is set).
+
+*** ~org-element-context~ no longer return objects in keywords
+
+~org-element-context~ used to return objects on some keywords, i.e.,
+=TITLE=, =DATE= and =AUTHOR=.  It now returns only the keyword.
+
+*** ~org-timer-default-timer~ type changed from number to string
+
+If you have, in your configuration, something like =(setq
+org-timer-default-timer 10)= replace it with =(setq
+org-timer-default-timer "10")=.
 
 *** Functions signature changes
 
@@ -109,32 +140,13 @@ docstring for more information.
 - ~org-latex-format-headline-function~
 - ~org-latex-format-inlinetask-function~
 - ~org-link-search~
-
-*** Default bindings of =C-c C-n= and =C-c C-p= changed
-
-The key sequences =C-c C-n= and =C-c C-p= are now bound to
-~org-next-visible-heading~ and ~org-next-visible-heading~
-respectively, rather than the =outline-mode= versions of these
-functions.  The Org version of these functions skips over inline tasks
-(and even-level headlines when ~org-odd-levels-only~ is set).
-
-*** ~org-element-context~ no longer return objects in keywords
-
-~org-element-context~ used to return objects on some keywords, i.e.,
-=TITLE=, =DATE= and =AUTHOR=.  It now returns only the keyword.
+** New features
 
 *** Behavior of ~org-return~ changed
 
 If point is before or after the headline title, insert a new line
 without changing the headline.
 
-*** ~org-timer-default-timer~ type changed from number to string
-
-If you have, in your configuration, something like =(setq
-org-timer-default-timer 10)= replace it with =(setq
-org-timer-default-timer "10")=.
-** New features
-
 *** Hierarchies of tags
 The functionality of nesting tags in hierarchies is added to org-mode.
 This is the generalization of what was previously called "Tag groups"
@@ -529,8 +541,8 @@ two of them, as if this option was nil (default value).
 
 *** ~org-export-with-creator~ is a boolean
 
-Special ~comment~ value is no longer allowed.  It is possible to use
-a body filter to add comments about the creator at the end of the
+Special ~comment~ value is no longer allowed.  It is possible to use a
+body filter to add comments about the creator at the end of the
 document instead.
 
 *** Removed option =org-babel-sh-command=
@@ -632,8 +644,7 @@ now.
 
 *** When exporting, throw an error on unresolved id/fuzzy links and code refs
 
-This helps spotting wrong links. 
-
+This helps spotting wrong links.
 * Version 8.2
 
 ** Incompatible changes
@@ -1876,7 +1887,7 @@ See http://orgmode.org/elpa/
 
 **** New =todo-unblocked= and =nottodo-unblocked= skip conditions
 
-     See the [[http://orgmode.org/w/?p%3Dorg-mode.git%3Ba%3Dcommit%3Bh%3Df426da][git commit]] for more explanations.
+     See the [[http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=f426da][git commit]] for more explanations.
 
 **** Allow category filtering in the agenda
 
@@ -2193,7 +2204,7 @@ See http://orgmode.org/elpa/
      Thanks to Carsten for implementing this.
 
 **** ODT: Add support for ODT export in org-bbdb.el
-**** ODT: Add support for indented tables (see [[http://orgmode.org/w/?p%3Dorg-mode.git%3Ba%3Dcommit%3Bh%3De9fd33][this commit]] for details)
+**** ODT: Add support for indented tables (see [[http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=e9fd33][this commit]] for details)
 **** ODT: Improve the conversion from ODT to other formats
 **** ASCII: Swap the level-1/level-2 characters to underline the headlines
 **** Support for Chinese, simplified Chinese, Russian, Ukrainian and Japanese