summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Vivier <zaeph@zaeph.net>2022-09-25 13:04:05 +0200
committerLeo Vivier <zaeph@zaeph.net>2022-09-25 13:04:05 +0200
commit82bfe76d5a6b4cedbdc4fe9a439ceccb467b9bc8 (patch)
treebeaf40e4a6858e95b090f8e85b5e8cbfcbb980c6
parente488177fea481641c3dcc3dfcc57eb57718bad58 (diff)
downloademacsconf-wiki-82bfe76d5a6b4cedbdc4fe9a439ceccb467b9bc8.tar.xz
emacsconf-wiki-82bfe76d5a6b4cedbdc4fe9a439ceccb467b9bc8.zip
Extra action for pulling and risky general setup
-rw-r--r--2022/organizers-notebook.md8
-rw-r--r--2022/organizers-notebook.org6
2 files changed, 9 insertions, 5 deletions
diff --git a/2022/organizers-notebook.md b/2022/organizers-notebook.md
index 20136d1e..92ea88ef 100644
--- a/2022/organizers-notebook.md
+++ b/2022/organizers-notebook.md
@@ -104,7 +104,7 @@ Planned dates and phases:
Current phase: No prerecs to process yet, so it's a good time to focus on infrastructure
-## TODO Review the submissions in the pad (see emacsconf-org-private or conf.org for the link) and add any objections or comments by Sept 26 for possible [early speaker notification](#orge7fc6a4), Oct 7 for everything :organizers:
+## TODO Review the submissions in the pad (see emacsconf-org-private or conf.org for the link) and add any objections or comments by Sept 26 for possible [early speaker notification](#org28f349d), Oct 7 for everything :organizers:
- zaeph: will start reviewing on Sep 21
@@ -529,7 +529,7 @@ We tried using q56 before, but it was a little too aggressive. Q=32 is the defau
### Test stream setup
-[Stream](#org03445f2)
+[Stream](#org4fe1799)
### Set up MPV for captions
@@ -846,7 +846,7 @@ Exceptions:
### Send thanks
-[Thank you, next steps](#orgc09c842)
+[Thank you, next steps](#orgad192ac)
### Extract the opening and closing remarks
@@ -997,7 +997,7 @@ Probably focus on grabbing the audio first and seeing what's worth keeping
Make a table of the form
-<table id="org6a86876" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<table id="org40dcda4" border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
<colgroup>
diff --git a/2022/organizers-notebook.org b/2022/organizers-notebook.org
index a7561584..a21dfdd1 100644
--- a/2022/organizers-notebook.org
+++ b/2022/organizers-notebook.org
@@ -17,11 +17,15 @@ You can open the following links (~C-c C-o~ or ~<mouse-1>~) to run the
associated actions:
General:
-- [[elisp:(org-babel-ref-resolve "general-setup()")][General setup]]
+- [[elisp:(org-babel-ref-resolve "general-setup()")][General setup]] / [[elisp:(prog1 (org-babel-ref-resolve "general-setup()") (org-babel-ref-resolve "i-like-danger()"))][Risky general setup]]
- [[elisp:(org-babel-ref-resolve "i-like-danger()")][I’m okay trading off security for convenience]] / [[elisp:(org-babel-ref-resolve "back-to-safety()")][Bring me back to safety]]
- [[elisp:(org-babel-ref-resolve "elisp-no-confirmation")][Do not ask for confirmation when evaluating elisp links or org-babel blocks]] (Risky)
- [[elisp:(org-babel-execute-buffer)][Execute buffer]] (Risky and unreliable for now)
+Importing changes:
+(This file is frequently edited, so you’d better pull before making your changes.)
+- [[elisp:(magit-pull-from-pushremote nil)][Pull from origin]]
+
Export:
- [[elisp:(progn (org-md-export-to-markdown) (org-babel-tangle))][Export and tangle]]
- [[elisp:(emacsconf-org-publish-this-page)][Export, tangle, commit, push]]