Merge branch 'maint'

lisp/org-pcomplete.el

@@ -40,11 +40,6 @@
 
 ;;;; Customization variables
 
-(defgroup org-complete nil
-  "Outline-based notes management and organizer."
-  :tag "Org"
-  :group 'org)
-
 (defvar org-drawer-regexp)
 (defvar org-property-re)
 (defvar org-current-tag-alist)

lisp/org.el

@@ -11887,7 +11887,7 @@ This is an alist of characters and values.  When
 read.  The key is first looked up in this alist, and the
 corresponding structure is inserted, with \"#+BEGIN_\" and
 \"#+END_\" added automatically."
-  :group 'org-completion
+  :group 'org-edit-structure
   :type '(repeat
 	  (cons (character :tag "Key")
 		(string :tag "Template")))

lisp/ox-publish.el

@@ -57,10 +57,10 @@ Every function in this hook will be called with two arguments:
 the name of the original file and the name of the file
 produced.")
 
-(defgroup org-publish nil
+(defgroup org-export-publish nil
   "Options for publishing a set of files."
   :tag "Org Publishing"
-  :group 'org)
+  :group 'org-export)
 
 (defcustom org-publish-project-alist nil
   "Association list to control publishing behavior.