summaryrefslogtreecommitdiffstats
path: root/pad/templates/settings.json
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2022-10-11 20:40:32 -0400
committerSacha Chua <sacha@sachachua.com>2022-10-11 20:41:07 -0400
commit8e290130b47b7f3b9d442c8d6531218eb2f09867 (patch)
treec8fab9bc27ab3f447524939ea8b2940b6080fba1 /pad/templates/settings.json
parent6d1743c83e239806b1b6fb635e184a59a5f28f5a (diff)
downloademacsconf-ansible-8e290130b47b7f3b9d442c8d6531218eb2f09867.tar.xz
emacsconf-ansible-8e290130b47b7f3b9d442c8d6531218eb2f09867.zip
Yay, pads are created based on the talks.json file
Also, the playbook waits until the pad is up
Diffstat (limited to 'pad/templates/settings.json')
-rw-r--r--pad/templates/settings.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/pad/templates/settings.json b/pad/templates/settings.json
index 137ce03..1832ef3 100644
--- a/pad/templates/settings.json
+++ b/pad/templates/settings.json
@@ -215,7 +215,7 @@
/*
* The default text of a pad
*/
- "defaultPadText" : "Conference info, how to watch/participate: https://emacsconf.org/2022/\nGuidelines for conduct: https://emacsconf.org/conduct/\nIRC: channel #emacsconf via https://chat.emacsconf.org or libera.chat network\n\nExcept where otherwise noted, the material on the EmacsConf pad are dual-licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International Public License; and the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) an later version. Copies of these two licenses are included in the EmacsConf wiki repository, in the COPYING.GPL and COPYING.CC-BY-SA files (https://emacsconf.org/COPYING/)\n\nBy contributing to this pad, you agree to make your contributions available under the above licenses. You are also promising that you are the author of your changes, or that you copied them from a work in the public domain or a work released under a free license that is compatible with the above two licenses. DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION.",
+ "defaultPadText" : "Conference info, how to watch/participate: https://emacsconf.org/2022/\nGuidelines for conduct: https://emacsconf.org/conduct/\nIRC: channel #emacsconf via https://chat.emacsconf.org or libera.chat network\nSee end of file for license (CC Attribution-ShareAlike 4.0 + GPLv3 or later)\n----------------------------------------------------------------\nQuestions and discussion go here:\n<ul><li></li><li></li><li></li></ul>\n----------------------------------------------------------------\nExcept where otherwise noted, the material on the EmacsConf pad are dual-licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International Public License; and the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) an later version. Copies of these two licenses are included in the EmacsConf wiki repository, in the COPYING.GPL and COPYING.CC-BY-SA files (https://emacsconf.org/COPYING/)\n\nBy contributing to this pad, you agree to make your contributions available under the above licenses. You are also promising that you are the author of your changes, or that you copied them from a work in the public domain or a work released under a free license that is compatible with the above two licenses. DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION.",
/*
* Default Pad behavior.