[elpa] master ccc0814 4/4: Merge commit 'cd8c87e7f70a71e9feb786308e17c3c4776b908b'

[Ian Dunn]

branch: master
commit ccc0814a3342252340fc8c8e9c9eba2227a472fc
Merge: bf8ecda cd8c87e
Author: Ian Dunn <address@hidden>
Commit: Ian Dunn <address@hidden>

    Merge commit 'cd8c87e7f70a71e9feb786308e17c3c4776b908b'
---
 packages/org-edna/org-edna.el   |   2 +-
 packages/org-edna/org-edna.info | 172 ++++++++++++++++++++--------------------
 packages/org-edna/org-edna.org  |  13 ++-
 3 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/packages/org-edna/org-edna.el b/packages/org-edna/org-edna.el
index e72dd4c..68cca82 100644
--- a/packages/org-edna/org-edna.el
+++ b/packages/org-edna/org-edna.el
@@ -1,6 +1,6 @@
 ;;; org-edna.el --- Extensible Dependencies 'N' Actions -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017-2020 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn <address@hidden>
 ;; Maintainer: Ian Dunn <address@hidden>
diff --git a/packages/org-edna/org-edna.info b/packages/org-edna/org-edna.info
index afedda2..0bd114c 100644
--- a/packages/org-edna/org-edna.info
+++ b/packages/org-edna/org-edna.info
@@ -1,4 +1,4 @@
-This is org-edna.info, produced by makeinfo version 6.5 from
+This is org-edna.info, produced by makeinfo version 6.7 from
 org-edna.texi.
 
 INFO-DIR-SECTION Emacs
@@ -17,7 +17,7 @@ Org Edna
 * Copying::
 * Introduction::                 A Brief Introduction to Edna
 * Basic Features::               Finders and Actions
-* Advanced Features::
+* Advanced Features::            Be careful in here
 * Extending Edna::               What else can it do?
 * Contributing::                 I wanna help!
 * Changelog::                    List of changes by version
@@ -206,9 +206,11 @@ org     9.0.5
      (require 'org-edna)
 
      ;; Always necessary
-     (org-edna-load)
+     (org-edna-mode)
 
-   If you ever want to disable Edna, run ‘org-edna-unload’.
+   If you ever want to disable Edna, run ‘(org-edna-mode)’ again.
+
+   To determine if Edna is active, check the ‘org-edna-mode’ variable.
 
 
 File: org-edna.info,  Node: Basic Operation,  Next: Blockers,  Prev: 
Installation and Setup,  Up: Introduction
@@ -2036,87 +2038,87 @@ Big release here, with three new features.
 
 Tag Table:
 Node: Top225
-Node: Copying4453
-Node: Introduction5276
-Node: Installation and Setup6224
-Node: Basic Operation6948
-Node: Blockers8799
-Node: Triggers9086
-Node: Syntax9348
-Node: Basic Features10038
-Node: Finders10392
-Node: ancestors12157
-Node: children12751
-Node: descendants13161
-Node: file13683
-Node: first-child14432
-Node: ids14692
-Node: match15353
-Node: next-sibling15991
-Node: next-sibling-wrap16248
-Node: olp16562
-Node: org-file16975
-Node: parent17620
-Node: previous-sibling17818
-Node: previous-sibling-wrap18079
-Node: relatives18358
-Node: rest-of-siblings22084
-Node: rest-of-siblings-wrap22369
-Node: self22718
-Node: siblings22879
-Node: siblings-wrap23116
-Node: Actions23420
-Node: Scheduled/Deadline24183
-Node: Timestamp Format27771
-Node: TODO State28659
-Node: Archive29384
-Node: Chain Property29704
-Node: Clocking30457
-Node: Property30869
-Node: Priority33042
-Node: Tag33611
-Node: Effort33828
-Node: Getting Help34212
-Node: Advanced Features34657
-Node: Finder Cache35105
-Node: Conditions36553
-Node: Heading is DONE37438
-Node: File Has Headings37644
-Node: Heading TODO State38066
-Node: Lisp Variable Set38360
-Node: Heading Has Property39029
-Node: Regexp Search39775
-Node: Checking Tags40218
-Node: Matching Headings41120
-Node: Negating Conditions41717
-Node: Multiple Conditions42140
-Node: Consideration42822
-Node: Conditional Forms45008
-Node: Setting the Properties47697
-Node: Extending Edna48781
-Node: Naming Conventions49271
-Node: Finders (1)50065
-Node: Actions (1)50431
-Node: Conditions (1)50896
-Node: Contributing51786
-Node: Bugs52652
-Node: Working with EDE53009
-Node: Compiling Edna54094
-Node: Testing Edna54963
-Node: Before Sending Changes55945
-Node: Developing with Bazaar56632
-Node: Documentation57373
-Node: Changelog57829
-Node: 10258118
-Node: 10158398
-Node: 1058535
-Node: 10beta859049
-Node: 10beta759172
-Node: 10beta659466
-Node: 10beta559742
-Node: 10beta460129
-Node: 10beta360382
-Node: 10beta260821
+Node: Copying4483
+Node: Introduction5306
+Node: Installation and Setup6254
+Node: Basic Operation7060
+Node: Blockers8911
+Node: Triggers9198
+Node: Syntax9460
+Node: Basic Features10150
+Node: Finders10504
+Node: ancestors12269
+Node: children12863
+Node: descendants13273
+Node: file13795
+Node: first-child14544
+Node: ids14804
+Node: match15465
+Node: next-sibling16103
+Node: next-sibling-wrap16360
+Node: olp16674
+Node: org-file17087
+Node: parent17732
+Node: previous-sibling17930
+Node: previous-sibling-wrap18191
+Node: relatives18470
+Node: rest-of-siblings22196
+Node: rest-of-siblings-wrap22481
+Node: self22830
+Node: siblings22991
+Node: siblings-wrap23228
+Node: Actions23532
+Node: Scheduled/Deadline24295
+Node: Timestamp Format27883
+Node: TODO State28771
+Node: Archive29496
+Node: Chain Property29816
+Node: Clocking30569
+Node: Property30981
+Node: Priority33154
+Node: Tag33723
+Node: Effort33940
+Node: Getting Help34324
+Node: Advanced Features34769
+Node: Finder Cache35217
+Node: Conditions36665
+Node: Heading is DONE37550
+Node: File Has Headings37756
+Node: Heading TODO State38178
+Node: Lisp Variable Set38472
+Node: Heading Has Property39141
+Node: Regexp Search39887
+Node: Checking Tags40330
+Node: Matching Headings41232
+Node: Negating Conditions41829
+Node: Multiple Conditions42252
+Node: Consideration42934
+Node: Conditional Forms45120
+Node: Setting the Properties47809
+Node: Extending Edna48893
+Node: Naming Conventions49383
+Node: Finders (1)50177
+Node: Actions (1)50543
+Node: Conditions (1)51008
+Node: Contributing51898
+Node: Bugs52764
+Node: Working with EDE53121
+Node: Compiling Edna54206
+Node: Testing Edna55075
+Node: Before Sending Changes56057
+Node: Developing with Bazaar56744
+Node: Documentation57485
+Node: Changelog57941
+Node: 10258230
+Node: 10158510
+Node: 1058647
+Node: 10beta859161
+Node: 10beta759284
+Node: 10beta659578
+Node: 10beta559854
+Node: 10beta460241
+Node: 10beta360494
+Node: 10beta260933
 
 End Tag Table
 
diff --git a/packages/org-edna/org-edna.org b/packages/org-edna/org-edna.org
index a1cf3a1..eacbd76 100644
--- a/packages/org-edna/org-edna.org
+++ b/packages/org-edna/org-edna.org
@@ -14,7 +14,7 @@
 #+TEXINFO_DIR_DESC: Extensible Dependencies 'N' Actions for Org Mode tasks
 
 * Copying
-Copyright (C) 2017-2018 Free Software Foundation, Inc.
+Copyright (C) 2017-2020 Free Software Foundation, Inc.
 
 #+BEGIN_QUOTE
 This program is free software: you can redistribute it and/or modify
@@ -80,10 +80,12 @@ After that, add the following to your init file (typically 
.emacs):
 (require 'org-edna)
 
 ;; Always necessary
-(org-edna-load)
+(org-edna-mode)
 #+END_SRC
 
-If you ever want to disable Edna, run ~org-edna-unload~.
+If you ever want to disable Edna, run ~(org-edna-mode)~ again.
+
+To determine if Edna is active, check the ~org-edna-mode~ variable.
 
 ** Basic Operation
 :PROPERTIES:
@@ -1641,6 +1643,11 @@ making any changes:
 :PROPERTIES:
 :DESCRIPTION: List of changes by version
 :END:
+** 1.1.1
+- Marked ~org-edna-load~ and ~org-edna-unload~ as deprecated
+- Renamed to ~org-edna--load~ and ~org-edna--unload~ to reflect internal use 
only intention
+** 1.1.0
+- Added ~org-edna-mode~ as a minor mode, as opposed to ~org-edna-load~ and 
~org-edna-unload~
 ** 1.0.2
 - Added ~org-edna-reset-cache~ to allow a user to reset the finder cache