Merge branch '13-terminology' into 'master'
Resolve "Consider terminology of ‘parental controls’" Closes #13 See merge request pwithnall/malcontent!99
This commit is contained in:
commit
045ed2ec02
|
@ -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
|
|
@ -3,7 +3,9 @@
|
||||||
<info>
|
<info>
|
||||||
<link type="guide" xref="index#setup"/>
|
<link type="guide" xref="index#setup"/>
|
||||||
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
|
<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
|
||||||
<desc>Overview of parental controls and the <app>Parental Controls</app> application.</desc>
|
<desc>Overview of parental controls, the <app>Parental Controls</app>
|
||||||
|
application and its use in other situations where access restrictions are
|
||||||
|
needed on a user.</desc>
|
||||||
<link type="seealso" xref="creating-a-child-user"/>
|
<link type="seealso" xref="creating-a-child-user"/>
|
||||||
</info>
|
</info>
|
||||||
|
|
||||||
|
@ -15,7 +17,7 @@
|
||||||
supervision.</p>
|
supervision.</p>
|
||||||
<p>This functionality can be used in other situations – such as other
|
<p>This functionality can be used in other situations – such as other
|
||||||
carer/caree relationships – but is labelled as ‘parental controls’ so that
|
carer/caree relationships – but is labelled as ‘parental controls’ so that
|
||||||
it’s easy to find.</p>
|
it’s easy to find, as that’s what most people will be looking for.</p>
|
||||||
<p>The parental controls for any user can be queried and set using the
|
<p>The parental controls for any user can be queried and set using the
|
||||||
<app>Parental Controls</app> application. This lists the non-administrator
|
<app>Parental Controls</app> application. This lists the non-administrator
|
||||||
accounts in tabs along its top bar, and shows their current parental
|
accounts in tabs along its top bar, and shows their current parental
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns="http://usefulinc.com/ns/doap#">
|
<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns="http://usefulinc.com/ns/doap#">
|
||||||
<name xml:lang="en">malcontent</name>
|
<name xml:lang="en">malcontent</name>
|
||||||
<shortdesc xml:lang="en">malcontent provides restrictions for children on Linux systems</shortdesc>
|
<shortdesc xml:lang="en">malcontent provides parental controls functionality on Linux systems</shortdesc>
|
||||||
<description xml:lang="en">malcontent implements support for restricting the abilities of non-administrator accounts on a Linux system.</description>
|
<description xml:lang="en">malcontent implements support for restricting the abilities of non-administrator accounts on a Linux system.</description>
|
||||||
<homepage rdf:resource="https://gitlab.freedesktop.org/pwithnall/malcontent"/>
|
<homepage rdf:resource="https://gitlab.freedesktop.org/pwithnall/malcontent"/>
|
||||||
<license rdf:resource="http://usefulinc.com/doap/licenses/lgpl"/>
|
<license rdf:resource="http://usefulinc.com/doap/licenses/lgpl"/>
|
||||||
|
|
Loading…
Reference in New Issue