From 946768b470e6a5abd565b30a04a938b5cbbecd86 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Thu, 8 Dec 2022 22:32:48 +0000 Subject: [PATCH 1/7] Updates for Client, Server --- contribute/en/Style-and-Tone.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index bda3006a6..9c0f4b3b1 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -89,9 +89,11 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Person” A human connected to a server (may be on multiple channels). “People on the server”, “People who have muted themselves” (not “Musicians” or "Channels"). -“Server” The general term for the machine that a client connects to. Not to be confused with “Directory”. +"Client" When capitalised, this means an instance of Jamulus running in client mode, used to connect to Jamulus Servers. -“Directory” The general term for a server that a client uses to get its list of public servers from. Use the term “Directory server” cautiously - it may be confusing in the presence of “Server”. +“Server” When capitalsed, this means an instance of Jamulus running in server mode. When lower case, this means the general term for the machine that runs the Server (eg "A Server running on an AWS server"). Not to be confused with “Directory”. + +“Directory” The term for a type of Server that a Client uses to get a list of Servers from. Avoid the use of the term “Directory Server” it may be confusing in the presence of “Server” on its own. “Country/Region” Keep in mind that some areas of the world have a controversal (political) status. If possible, be generic and remain neutral. Instead of just saying country, use “Country/Region“ or “Location“. From 9ae91c40f674d9af8f629fed94b7ed14009298a8 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Sun, 18 Dec 2022 11:57:42 +0000 Subject: [PATCH 2/7] Add note on Server "listing" --- contribute/en/Style-and-Tone.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 9c0f4b3b1..836c4ded1 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -97,6 +97,8 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Country/Region” Keep in mind that some areas of the world have a controversal (political) status. If possible, be generic and remain neutral. Instead of just saying country, use “Country/Region“ or “Location“. +Registration: When a Server is configured in Registered mode, it will be "listed" when successfully registered by a Directory. Note that if a Directory is full, a Registered Server may not therefore be "listed" becuase it has not been successfully "registered". + ## Units We use the following abbreviations: From da1019b0f70b94ef037df42ae5ccb7853d1e1372 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Wed, 21 Dec 2022 09:59:13 +0000 Subject: [PATCH 3/7] Use italics Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> --- contribute/en/Style-and-Tone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 836c4ded1..28dd39cf5 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -97,7 +97,7 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Country/Region” Keep in mind that some areas of the world have a controversal (political) status. If possible, be generic and remain neutral. Instead of just saying country, use “Country/Region“ or “Location“. -Registration: When a Server is configured in Registered mode, it will be "listed" when successfully registered by a Directory. Note that if a Directory is full, a Registered Server may not therefore be "listed" becuase it has not been successfully "registered". +Registration: When a Server is configured in Registered mode, it will be _listed_ when successfully registered by a Directory. Note that if a Directory is full, a Registered Server will not be _listed_ because it has not been successfully _registered_. ## Units From 6a5f2653e9de6ec7fdda75106b83cdf40fe7a61c Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Wed, 21 Dec 2022 09:59:30 +0000 Subject: [PATCH 4/7] Use italics Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> --- contribute/en/Style-and-Tone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 28dd39cf5..f95d4220a 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -95,7 +95,7 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Directory” The term for a type of Server that a Client uses to get a list of Servers from. Avoid the use of the term “Directory Server” it may be confusing in the presence of “Server” on its own. -“Country/Region” Keep in mind that some areas of the world have a controversal (political) status. If possible, be generic and remain neutral. Instead of just saying country, use “Country/Region“ or “Location“. +“Country/Region” Keep in mind that some areas of the world have a controversial (political) status. If possible, be generic and remain neutral. Instead of just saying country, use _Country/Region_ or _Location_. Registration: When a Server is configured in Registered mode, it will be _listed_ when successfully registered by a Directory. Note that if a Directory is full, a Registered Server will not be _listed_ because it has not been successfully _registered_. From 582934bf2e83508a6ed1204ccf5135cb8fd2a167 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Wed, 21 Dec 2022 09:59:54 +0000 Subject: [PATCH 5/7] Use italics Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> --- contribute/en/Style-and-Tone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index f95d4220a..5cdb4ba01 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -93,7 +93,7 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Server” When capitalsed, this means an instance of Jamulus running in server mode. When lower case, this means the general term for the machine that runs the Server (eg "A Server running on an AWS server"). Not to be confused with “Directory”. -“Directory” The term for a type of Server that a Client uses to get a list of Servers from. Avoid the use of the term “Directory Server” it may be confusing in the presence of “Server” on its own. +“Directory” The term for a type of Server that a Client uses to get a list of Servers from. Avoid the use of the term _Directory Server_ because it may be confusing in the presence of _Server_ on its own. “Country/Region” Keep in mind that some areas of the world have a controversial (political) status. If possible, be generic and remain neutral. Instead of just saying country, use _Country/Region_ or _Location_. From e1a97eb06a2127ba636be54dda228d14fed60d3b Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Wed, 21 Dec 2022 10:01:35 +0000 Subject: [PATCH 6/7] Use italics Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> --- contribute/en/Style-and-Tone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 5cdb4ba01..04545459a 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -91,7 +91,7 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open "Client" When capitalised, this means an instance of Jamulus running in client mode, used to connect to Jamulus Servers. -“Server” When capitalsed, this means an instance of Jamulus running in server mode. When lower case, this means the general term for the machine that runs the Server (eg "A Server running on an AWS server"). Not to be confused with “Directory”. +“Server” When capitalized, refers to an instance of Jamulus running in server mode. When lowercase as _server_, this refers to the computer that runs the Server (e.g. _A Server running on an AWS server_). Not to be confused with Directory. “Directory” The term for a type of Server that a Client uses to get a list of Servers from. Avoid the use of the term _Directory Server_ because it may be confusing in the presence of _Server_ on its own. From 4ff92f503a67f84ccc7820be936797d9aae0b4a1 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Wed, 21 Dec 2022 10:02:31 +0000 Subject: [PATCH 7/7] Update for style Co-authored-by: John Dempsey <1750243+mcfnord@users.noreply.github.com> --- contribute/en/Style-and-Tone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contribute/en/Style-and-Tone.md b/contribute/en/Style-and-Tone.md index 04545459a..3bf0d414d 100644 --- a/contribute/en/Style-and-Tone.md +++ b/contribute/en/Style-and-Tone.md @@ -87,7 +87,7 @@ Jamulus is “Free and Open Source (FOSS)” (not “free software” or “open “Fader” The UI that controls a channel. “Each fader has a mute button”, “The person’s fader” ,“Group faders together” (not “The person’s channel” or “Mute a Fader”, not “Slider” or “Volume control”) -“Person” A human connected to a server (may be on multiple channels). “People on the server”, “People who have muted themselves” (not “Musicians” or "Channels"). +“Person” A human connected to a server (may be on multiple channels). We might say _people on the server_, or _people who have muted themselves_, rather than _Musicians_ or _Channels_. "Client" When capitalised, this means an instance of Jamulus running in client mode, used to connect to Jamulus Servers.