summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2017-11-26 20:35:57 -0500
committerKyle Meyer <kyle@kyleam.com>2017-11-26 20:35:57 -0500
commit5cd7eb3d537866c40b16d9acbc1cf8233944905b (patch)
treebb4f9515c7f91981d6bdba5f55ac5a62b8971a54
parent579fa12f50ca2381a584acf0a7da988887143719 (diff)
parentadfbfd42b2982ca8865c9f9e289d888fe294a8b1 (diff)
downloadorg-mode-5cd7eb3d537866c40b16d9acbc1cf8233944905b.tar.gz
Merge branch 'maint'
-rw-r--r--etc/ORG-NEWS2
-rw-r--r--lisp/ox-odt.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 6448e67..b41804e 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -2171,7 +2171,7 @@ This enables SVG generation from latex code blocks.
*** New option: [[doc:org-habit-show-done-always-green][org-habit-show-done-always-green]]
-See [[https://lists.gnu.org/archive/html/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
+See [[https://lists.gnu.org/r/emacs-orgmode/2013-05/msg00214.html][this message]] from Max Mikhanosha.
*** New option: [[doc:org-babel-inline-result-wrap][org-babel-inline-result-wrap]]
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index d585636..a19bab2 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3886,7 +3886,7 @@ contextual information."
;; themselves and the list can be arbitrarily deep.
;;
;; Inspired by following thread:
-;; https://lists.gnu.org/archive/html/emacs-orgmode/2011-03/msg01101.html
+;; https://lists.gnu.org/r/emacs-orgmode/2011-03/msg01101.html
;; Translate lists to tables