From 0c0bc8419093a1034ae5e1cdb2a63b04ae8267fc Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 11 Oct 2016 18:00:08 +0200
Subject: [PATCH] Change "Org-mode" into "Org mode"

* lisp/org-agenda.el:
* lisp/org-attach.el:
* lisp/org-bbdb.el:
* lisp/org-capture.el:
* lisp/org-clock.el:
* lisp/org-entities.el:
* lisp/org-gnus.el:
* lisp/org-habit.el:
* lisp/org-id.el:
* lisp/org-info.el:
* lisp/org-inlinetask.el:
* lisp/org-irc.el:
* lisp/org-list.el:
* lisp/org-mhe.el:
* lisp/org-mouse.el:
* lisp/org-table.el:
* lisp/ox-html.el:
* lisp/ox-odt.el: Use "Org mode", or "Org", instead of "Org-mode".
---
 lisp/org-agenda.el     | 12 ++++++------
 lisp/org-attach.el     |  2 +-
 lisp/org-bbdb.el       |  2 +-
 lisp/org-capture.el    |  2 +-
 lisp/org-clock.el      |  9 +++++----
 lisp/org-entities.el   |  4 ++--
 lisp/org-gnus.el       |  2 +-
 lisp/org-habit.el      |  2 +-
 lisp/org-id.el         |  2 +-
 lisp/org-info.el       |  2 +-
 lisp/org-inlinetask.el |  2 +-
 lisp/org-irc.el        |  2 +-
 lisp/org-list.el       |  4 ++--
 lisp/org-mhe.el        |  2 +-
 lisp/org-mouse.el      |  2 +-
 lisp/org-table.el      | 10 +++++-----
 lisp/ox-html.el        |  2 +-
 lisp/ox-odt.el         |  2 +-
 18 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index bde2f8d17..947bcb812 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -24,7 +24,7 @@
 ;;
 ;;; Commentary:
 
-;; This file contains the code for creating and using the Agenda for Org-mode.
+;; This file contains the code for creating and using the Agenda for Org.
 ;;
 ;; The functions `org-batch-agenda', `org-batch-agenda-csv', and
 ;; `org-batch-store-agenda-views' are implemented as macros to provide
@@ -134,7 +134,7 @@ addresses the separator between the current and the previous block."
 	  (string)))
 
 (defgroup org-agenda-export nil
-  "Options concerning exporting agenda views in Org-mode."
+  "Options concerning exporting agenda views in Org mode."
   :tag "Org Agenda Export"
   :group 'org-agenda)
 
@@ -236,7 +236,7 @@ you can \"misuse\" it to also add other text to the header."
   :type 'boolean)
 
 (defgroup org-agenda-custom-commands nil
-  "Options concerning agenda views in Org-mode."
+  "Options concerning agenda views in Org mode."
   :tag "Org Agenda Custom Commands"
   :group 'org-agenda)
 
@@ -5200,7 +5200,7 @@ date.  It also removes lines that contain only whitespace."
   (while (re-search-forward "^ +\n" nil t)
     (replace-match ""))
   (goto-char (point-min))
-  (if (re-search-forward "^Org-mode dummy\n?" nil t)
+  (if (re-search-forward "^Org mode dummy\n?" nil t)
       (replace-match ""))
   (run-hooks 'org-agenda-cleanup-fancy-diary-hook))
 
@@ -5234,9 +5234,9 @@ Needed to avoid empty dates which mess up holiday display."
   ;; Catch the error if dealing with the new add-to-diary-alist
   (when org-disable-agenda-to-diary
     (condition-case nil
-	(org-add-to-diary-list original-date "Org-mode dummy" "")
+	(org-add-to-diary-list original-date "Org mode dummy" "")
       (error
-       (org-add-to-diary-list original-date  "Org-mode dummy" "" nil)))))
+       (org-add-to-diary-list original-date  "Org mode dummy" "" nil)))))
 
 (defun org-add-to-diary-list (&rest args)
   (if (fboundp 'diary-add-to-list)
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 4bcf28bf9..d6e587d83 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -43,7 +43,7 @@
 (require 'vc-git)
 
 (defgroup org-attach nil
-  "Options concerning entry attachments in Org-mode."
+  "Options concerning entry attachments in Org mode."
   :tag "Org Attach"
   :group 'org)
 
diff --git a/lisp/org-bbdb.el b/lisp/org-bbdb.el
index 466c15b7a..dd9ef2696 100644
--- a/lisp/org-bbdb.el
+++ b/lisp/org-bbdb.el
@@ -25,7 +25,7 @@
 ;;
 ;;; Commentary:
 
-;; This file implements links to BBDB database entries from within Org-mode.
+;; This file implements links to BBDB database entries from within Org.
 ;; Org mode loads this module by default - if this is not what you want,
 ;; configure the variable `org-modules'.
 
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index f4ca6f63e..13996f4b4 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -675,7 +675,7 @@ captured item after finalizing."
     (setq stay-with-capture t))
   (unless (and org-capture-mode
 	       (buffer-base-buffer (current-buffer)))
-    (error "This does not seem to be a capture buffer for Org-mode"))
+    (error "This does not seem to be a capture buffer for Org mode"))
 
   (run-hooks 'org-capture-prepare-finalize-hook)
 
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index da9b8375f..5a6d936a5 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -45,7 +45,7 @@
 
 
 (defgroup org-clock nil
-  "Options concerning clocking working time in Org-mode."
+  "Options concerning clocking working time in Org mode."
   :tag "Org Clock"
   :group 'org-progress)
 
@@ -279,7 +279,7 @@ string as argument."
 	  (function :tag "Function")))
 
 (defgroup org-clocktable nil
-  "Options concerning the clock table in Org-mode."
+  "Options concerning the clock table in Org mode."
   :tag "Org Clock Table"
   :group 'org-clock)
 
@@ -695,7 +695,8 @@ If not, show simply the clocked time like 01:50."
   (setq org-mode-line-string
 	(propertize
 	 (let ((clock-string (org-clock-get-clock-string))
-	       (help-text "Org-mode clock is running.\nmouse-1 shows a menu\nmouse-2 will jump to task"))
+	       (help-text "Org mode clock is running.\nmouse-1 shows a \
+menu\nmouse-2 will jump to task"))
 	   (if (and (> org-clock-string-limit 0)
 		    (> (length clock-string) org-clock-string-limit))
 	       (propertize
@@ -797,7 +798,7 @@ use libnotify if available, or fall back on a message."
 			org-show-notification-handler notification))
 	((fboundp 'notifications-notify)
 	 (notifications-notify
-	  :title "Org-mode message"
+	  :title "Org mode message"
 	  :body notification
 	  ;; FIXME how to link to the Org icon?
 	  ;; :app-icon "~/.emacs.d/icons/mail.png"
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 51f5a06f3..dcab7d722 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -31,7 +31,7 @@
 (declare-function org-table-align            "org-table" ())
 
 (defgroup org-entities nil
-  "Options concerning entities in Org-mode."
+  "Options concerning entities in Org mode."
   :tag "Org Entities"
   :group 'org)
 
@@ -558,7 +558,7 @@ This first checks the user list, then the built-in list."
   "Create a Help buffer with all available entities."
   (interactive)
   (with-output-to-temp-buffer "*Org Entity Help*"
-    (princ "Org-mode entities\n=================\n\n")
+    (princ "Org mode entities\n=================\n\n")
     (let ((ll (append '("* User-defined additions (variable org-entities-user)")
 		      org-entities-user
 		      org-entities))
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 717c0c2b7..5380e8e4a 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -25,7 +25,7 @@
 ;;
 ;;; Commentary:
 
-;; This file implements links to Gnus groups and messages from within Org-mode.
+;; This file implements links to Gnus groups and messages from within Org.
 ;; Org mode loads this module by default - if this is not what you want,
 ;; configure the variable `org-modules'.
 
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 868b425e1..081627e1f 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -33,7 +33,7 @@
 (require 'org-agenda)
 
 (defgroup org-habit nil
-  "Options concerning habit tracking in Org-mode."
+  "Options concerning habit tracking in Org mode."
   :tag "Org Habit"
   :group 'org-progress)
 
diff --git a/lisp/org-id.el b/lisp/org-id.el
index dfb7912cd..cf2685153 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -77,7 +77,7 @@
 ;;; Customization
 
 (defgroup org-id nil
-  "Options concerning global entry identifiers in Org-mode."
+  "Options concerning global entry identifiers in Org mode."
   :tag "Org ID"
   :group 'org)
 
diff --git a/lisp/org-info.el b/lisp/org-info.el
index 33fbe1298..d82168ec8 100644
--- a/lisp/org-info.el
+++ b/lisp/org-info.el
@@ -24,7 +24,7 @@
 ;;
 ;;; Commentary:
 
-;; This file implements links to Info nodes from within Org-mode.
+;; This file implements links to Info nodes from within Org mode.
 ;; Org mode loads this module by default - if this is not what you want,
 ;; configure the variable `org-modules'.
 
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 5f14d500c..910b1a039 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -26,7 +26,7 @@
 ;;
 ;;; Commentary:
 ;;
-;; This module implements inline tasks in Org-mode.  Inline tasks are
+;; This module implements inline tasks in Org mode.  Inline tasks are
 ;; tasks that have all the properties of normal outline nodes,
 ;; including the ability to store meta data like scheduling dates,
 ;; TODO state, tags and properties.  However, these nodes are treated
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index ba1a7ae36..2447793b8 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -22,7 +22,7 @@
 
 ;;; Commentary:
 
-;; This file implements links to an IRC session from within Org-mode.
+;; This file implements links to an IRC session from within Org mode.
 ;; Org mode loads this module by default - if this is not what you want,
 ;; configure the variable `org-modules'.
 ;;
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 044049602..ad092d32b 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -25,7 +25,7 @@
 ;;
 ;;; Commentary:
 
-;; This file contains the code dealing with plain lists in Org-mode.
+;; This file contains the code dealing with plain lists in Org mode.
 
 ;; The core concept behind lists is their structure.  A structure is
 ;; a snapshot of the list, in the shape of a data tree (see
@@ -164,7 +164,7 @@
 ;;; Configuration variables
 
 (defgroup org-plain-lists nil
-  "Options concerning plain lists in Org-mode."
+  "Options concerning plain lists in Org mode."
   :tag "Org Plain lists"
   :group 'org-structure)
 
diff --git a/lisp/org-mhe.el b/lisp/org-mhe.el
index 558fa0f69..5d9ae5898 100644
--- a/lisp/org-mhe.el
+++ b/lisp/org-mhe.el
@@ -24,7 +24,7 @@
 ;;
 ;;; Commentary:
 
-;; This file implements links to MH-E messages from within Org-mode.
+;; This file implements links to MH-E messages from within Org.
 ;; Org mode loads this module by default - if this is not what you want,
 ;; configure the variable `org-modules'.
 
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index 2c4dc7d6d..797a21fba 100644
--- a/lisp/org-mouse.el
+++ b/lisp/org-mouse.el
@@ -68,7 +68,7 @@
 ;;
 ;; Since version 5.10: Changes are listed in the general Org docs.
 ;;
-;; Version 5.09;; + Version number synchronization with Org-mode.
+;; Version 5.09;; + Version number synchronization with Org mode.
 ;;
 ;; Version 0.25
 ;; + made compatible with Org 4.70 (thanks to Carsten for the patch)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 5c49231e5..a9f2e4ad0 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -89,7 +89,7 @@ for empty fields).  Outside tables, the correct binding of the keys is
 restored.
 
 The default for this option is t if the optimized version is also used in
-Org-mode.  See the variable `org-enable-table-editor' for details.  Changing
+Org mode.  See the variable `org-enable-table-editor' for details.  Changing
 this variable requires a restart of Emacs to become effective."
   :group 'org-table
   :type 'boolean)
@@ -144,7 +144,7 @@ table, obtained by prompting the user."
 		(string :tag "Format"))))
 
 (defgroup org-table-settings nil
-  "Settings for tables in Org-mode."
+  "Settings for tables in Org mode."
   :tag "Org Table Settings"
   :group 'org-table)
 
@@ -193,7 +193,7 @@ alignment to the right border applies."
   :type 'number)
 
 (defgroup org-table-editing nil
-  "Behavior of tables during editing in Org-mode."
+  "Behavior of tables during editing in Org mode."
   :tag "Org Table Editing"
   :group 'org-table)
 
@@ -245,7 +245,7 @@ this line."
   :type 'boolean)
 
 (defgroup org-table-calculation nil
-  "Options concerning tables in Org-mode."
+  "Options concerning tables in Org mode."
   :tag "Org Table Calculation"
   :group 'org-table)
 
@@ -386,7 +386,7 @@ columns if an out-of-bounds field is being set."
 	  (const :tag "When setting an out-of-bounds field, the user is prompted" prompt)))
 
 (defgroup org-table-import-export nil
-  "Options concerning table import and export in Org-mode."
+  "Options concerning table import and export in Org mode."
   :tag "Org Table Import Export"
   :group 'org-table)
 
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 26c5cdd6f..0b8e1c80e 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1813,7 +1813,7 @@ INFO is a plist used as a communication channel."
 	      info)
 	     "\n")))
      (format "<title>%s</title>\n" title)
-     (org-html-close-tag "meta" "name=\"generator\" content=\"Org-mode\"" info)
+     (org-html-close-tag "meta" "name=\"generator\" content=\"Org mode\"" info)
      "\n"
      (and (org-string-nw-p author)
 	  (concat
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index edc883bd8..4fb8c15c2 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3572,7 +3572,7 @@ pertaining to indentation here."
     ;;
     ;; - Description lists are simulated as plain lists.
     ;; - Low-level headlines can be listified.
-    ;; - In Org-mode, a table can occur not only as a regular list
+    ;; - In Org mode, a table can occur not only as a regular list
     ;;   item, but also within description lists and low-level
     ;;   headlines.
 
-- 
2.11.4.GIT