diff --git a/config/survey.jl b/config/survey.jl
index 15c503d..4b0344a 100644
--- a/config/survey.jl
+++ b/config/survey.jl
@@ -41,7 +41,9 @@ the questions you see now will not neccesarily be in the final survey.",
mandatory=false),
MultiSelect(:operating_system,
"Which operating system to you use Emacs on?",
- ["GNU/Linux", "Windows", "MacOS", "BSD", :other]),
+ ["GNU/Linux",
+ "Linux via WSL" => "WSL",
+ "Windows", "MacOS", "BSD", :other]),
MultiSelect(:emacs_mode,
"How do you run Emacs?",
["Graphical Application (GUI)" => "GUI",
@@ -140,8 +142,8 @@ the questions you see now will not neccesarily be in the final survey.",
"Where do you ask for help using packages?",
["IRC", "Matrix", "Reddit", "Emacs StackExchange",
"My emacs framework's community" => "Framework",
- "GitHub", "Mailing lists", "Email the maintainer(s)" => "Email", "Discord",
- :other]),
+ "GitHub", "Mailing lists", "Email the maintainer(s)" => "Email",
+ "Discord", "Discourse", :other]),
MultiSelect(:package_contibutions,
"What contributions do you make to packages you use?",
["Issues", "Code (feqtures)", "Code (bugfixes)", "Documentation", "Advocacy"],
@@ -163,6 +165,14 @@ the questions you see now will not neccesarily be in the final survey.",
"FSF paperwork (for GNU ELPA)" => "FSF paperwork",
:other],
mandatory=false),
+ RadioSelect(:fsf_paperwork_year,
+ "Have you signed (or attempted to sign) the FSF copyright papers?",
+ ["No, never seriously considered" => "never considered",
+ "No, but I might in the future" => "might in future",
+ "Yes, within the last 2 years" => "0-2y",
+ "Yes, 2-5 years ago" => "2-5y",
+ "Yes, 5-10 years ago" => "5-10y",
+ "Yes, 10+ years ago" => "10+y"])
TextArea(:package_submission,
"If you write packages, how you you decide which repositories to submit it to (if any)?",
mandatory=false),
@@ -200,7 +210,7 @@ the questions you see now will not neccesarily be in the final survey.",
"eshell", "term", "ansi-term", "vterm", :other]),
RadioSelect(:email_package,
"Do you use an Email client in Emacs?",
- ["No", "Gnus", "Mu4e", "notmuch", "Wanderlust", :other]),
+ ["No", "Gnus", "Mu4e", "notmuch", "Wanderlust", "Rmail", :other]),
RadioSelect(:spell_package,
"Do you use a spell checker in Emacs?",
["No", "My framework/starter kit's default" => "framework default",
@@ -306,6 +316,14 @@ the questions you see now will not neccesarily be in the final survey.",
"Software Development", "Telecom",
:other],
mandatory=false)),
+ SurveyPart("Other software usage",
+ RadioSelect(:free_software_zeal,
+ "How strongly do the ideals of free/libre software affect your computer use?",
+ ["I have a clear preference for free/libre software and am willing to accept any lack of features or UI polish",
+ "I have a clear preference for free/libre software and am willing to accept a significant lack of features or UI polish",
+ "I have a clear preference for free/libre software and am willing to accept a limited lack of features or UI polish",
+ "I have a clear preference for free/libre software but am not willing to accept a lack of features or UI polish",
+ "I have no preference for free/libre software"])),
SurveyPart("Survey bookeeping",
RadioSelect(:survey_prior,
"Did you respond to the 2020 Emacs survey?",
@@ -313,7 +331,7 @@ the questions you see now will not neccesarily be in the final survey.",
RadioSelect(:survey_referrer,
"How did you find out about this survey?",
["r/emacs", "Hacker News", "Direct message / friend" => "Friend",
- "Discord", "Twitter", "Blog post", "Emacs mailing list",
+ "Discord", "Discourse", "Twitter", "Blog post", "Emacs mailing list",
"lobste.rs", "Telegram", "Emacs China", "IRC",
:other]),
RadioSelect(:survey_ux,