From d31d0218966a66ab62b7f196ff7a0a046d290b73 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 28 Oct 2020 16:34:42 +0000 Subject: [PATCH 1/3] help: Clarify that parental controls can be used in other situations Signed-off-by: Philip Withnall Helps: #13 --- help/C/introduction.page | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/help/C/introduction.page b/help/C/introduction.page index 4f9c2a2..1faa8de 100644 --- a/help/C/introduction.page +++ b/help/C/introduction.page @@ -3,7 +3,9 @@ - Overview of parental controls and the Parental Controls application. + Overview of parental controls, the Parental Controls + application and its use in other situations where access restrictions are + needed on a user. @@ -15,7 +17,7 @@ supervision.

This functionality can be used in other situations ­– such as other carer/caree relationships – but is labelled as ‘parental controls’ so that - it’s easy to find.

+ it’s easy to find, as that’s what most people will be looking for.

The parental controls for any user can be queried and set using the Parental Controls application. This lists the non-administrator accounts in tabs along its top bar, and shows their current parental From ac2ed2c21adf94be3180fa09e23c8b6e9154160a Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 28 Oct 2020 16:35:08 +0000 Subject: [PATCH 2/3] docs: Tidy up wording in DOAP file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’re standardising on ‘parental controls’ as terminology, and moving away from explicitly referring to ‘children’. Signed-off-by: Philip Withnall Helps: #13 --- malcontent.doap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/malcontent.doap b/malcontent.doap index c746cc4..4841a46 100644 --- a/malcontent.doap +++ b/malcontent.doap @@ -1,6 +1,6 @@ malcontent - malcontent provides restrictions for children on Linux systems + malcontent provides parental controls functionality on Linux systems malcontent implements support for restricting the abilities of non-administrator accounts on a Linux system. From f791ded58fdde90bc3cc7af2376ba05663de68cf Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 28 Oct 2020 17:01:44 +0000 Subject: [PATCH 3/3] docs: Document terminology used in the project This is to be referred to by developers when working on the project, and documents the decisions behind the terminology used. Signed-off-by: Philip Withnall Fixes: #13 --- HACKING.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 HACKING.md diff --git a/HACKING.md b/HACKING.md new file mode 100644 index 0000000..3a2a921 --- /dev/null +++ b/HACKING.md @@ -0,0 +1,22 @@ +Terminology +----------- + +The main terminology used in malcontent is ‘parental controls’, which are +implemented by ‘administrators’ and enforced on ‘child users’. + +The feature applies to a range of other carer/caree relationships, though, where +the ‘caree’ user might need to be protected from doing things on the computer +which aren’t suitable for them. + +The terminology ‘parental controls’ is used consistently, despite not all +situations actually involving a parent or child, because that’s how most users +will find the functionality. + +To remain as inclusive as possible, there are some rules about which terminology +to use: + - Use ‘parental controls’ to refer to the overall feature + - Refer to ‘administrators’ or ‘administrator accounts’ rather than ‘parents’ + - Refer to ‘child users’ in general contexts, but refer to particular user + accounts using their full name — don’t mention ‘child’ in that case + +Reference: https://gitlab.freedesktop.org/pwithnall/malcontent/-/issues/13