Merge branch 'master' of git.emacsconf.org:emacsconf-wiki

2 files changed, 62 insertions, 10 deletions

diff --git a/2022/talks/devel.md b/2022/talks/devel.md
new file mode 100644
index 00000000..f852e953
--- /dev/null
+++ b/2022/talks/devel.md
@@ -0,0 +1,22 @@
+[[!meta title="Emacs development updates"]]
+[[!meta copyright="Copyright © 2022 John Wiegley"]]
+[[!inline pages="internal(2022/info/devel-nav)" raw="yes"]]
+
+<!-- Initially generated with emacsconf-generate-talk-page and then left alone for manual editing -->
+<!-- You can manually edit this file to update the abstract, add links, etc. --->
+
+
+# Emacs development updates
+John Wiegley
+
+[[!inline pages="internal(2022/info/devel-before)" raw="yes"]]
+
+What has been happening and what is soon to come in Emacs development
+
+
+
+[[!inline pages="internal(2022/info/devel-after)" raw="yes"]]
+
+[[!inline pages="internal(2022/info/devel-nav)" raw="yes"]]
+
+
diff --git a/2022/talks/orgsuperlinks.md b/2022/talks/orgsuperlinks.md
index b86d9624..1fcf4c15 100644
--- a/2022/talks/orgsuperlinks.md
+++ b/2022/talks/orgsuperlinks.md
@@ -7,25 +7,55 @@
 <!-- You can manually edit this file to update the abstract, add links, etc. --->
 
 
-# Linking headings with org-super-links (poor-man's Zettelkasten)
+# Linking headings (poor-man's Zettelkasten) and defining advanced task dependencies
 Karl Voit (he/him, IRC: publicvoit, <mailto:EmacsConf22@Karl-Voit.at>)
 
 [[!inline pages="internal(2022/info/orgsuperlinks-before)" raw="yes"]]
 
-As written on
-<https://karl-voit.at/2020/06/14/Zettelkasten-concerns> Karl thinks
-that a full-blown Zettelkasten workflow is not always a perfect match
-for a given set of requirements.
+As written in [this blog
+article](https://karl-voit.at/2020/06/14/Zettelkasten-concerns), Karl
+thinks that a full-blown Zettelkasten workflow is not always a perfect
+match for a given set of requirements.
 
-To him, the most important aspects of the Zettelkasten method are the
-bi-directional links between arbitrary headings. If you want to use
+To him, the most important aspect of the Zettelkasten method are the
+**bi-directional links between arbitrary headings**. If you want to use
 such links without the additional burden and benefit of a
 Zettelkasten implementation, you might want to learn how
-org-super-links is able to help you here.
+bi-directional links are able to help you here.
 
-In this talk, you will see how org-super-links are being used in
-the author's setup for linking headings.
+In this talk, you will see a demo how links are used in the author's
+setup for linking headings and **defining advanced dependencies between
+todo headings**.
 
+You can find [the **self-contained demo file** on
+Gitlab.com](https://gitlab.com/publicvoit/orgmode-link-demo). It
+consists of various packages and some Elisp glue to create these methods:
+
+- Bi-directional links between headings:
+  - [org-super-links](https://github.com/toshism/org-super-links) with `org-super-links-org-ql` and `org-super-links-org-rifle`
+    - `org-super-links-quick-insert-inline-link`
+    - `org-super-links-quick-insert-drawer-link`
+  - [org-linker](https://github.com/toshism/org-linker)
+
+- Advanced dependencies:
+  - [org-edna](https://www.nongnu.org/org-edna-el/)
+  - [org-linker-edna](https://github.com/toshism/org-linker-edna)
+
+- Search, completion and narrowing:
+  - [helm](https://emacs-helm.github.io/helm/)
+  - [helm-org](https://github.com/emacs-helm/helm-org)
+  - [org-ql](https://github.com/alphapapa/org-ql) with `helm-org-ql`
+
+- Adding CREATED properties for new headings: [org-expiry](https://git.sr.ht/~bzg/org-contrib/blob/master/lisp/org-expiry.el) (not necessary for any demo functionality)
+
+More on bi-directional links and Karl's Org mode projects:
+
+- [UOMF: Linking Headings With org-super-links (Poor-Man's Zettelkasten)](https://karl-voit.at/2020/07/22/org-super-links/)
+- [UOMF: On How to Define Projects in Org Mode](https://karl-voit.at/2019/11/03/org-projects/)
+- [A Draft Workflow for Advanced Project Management Using Org Mode and Org Edna](https://karl-voit.at/2020/08/14/project-mgt-draft/)
+- [Zettelkasten/Org-roam/Org-brain Is Crap](https://karl-voit.at/2020/06/14/Zettelkasten-concerns/)
+
+[More Emacs-related articles by Karl](https://karl-voit.at/tags/emacs/)
 
 
 [[!inline pages="internal(2022/info/orgsuperlinks-after)" raw="yes"]]