summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2023-09-25 13:42:33 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-10-09 14:40:13 +0200
commit72d4f157ab3c4955ac3636b6500d24cf36d1a0ed (patch)
tree91ca03dc86b27f4a5021c60f4dda2ae84dbff407
parent6a6843cbe2775aa6ad24a1f61d6b863ff982b817 (diff)
downloadmullvadvpn-72d4f157ab3c4955ac3636b6500d24cf36d1a0ed.tar.xz
mullvadvpn-72d4f157ab3c4955ac3636b6500d24cf36d1a0ed.zip
Refrain from using the word `proxy` where it does not make sense
Do not use the word "proxy" in the context of API access methods, but only in the context where we are actually refering to a proxy (such as `SOCKS5` or `Shadowsocks` proxies).
-rw-r--r--mullvad-cli/src/cmds/api_access.rs24
-rw-r--r--mullvad-cli/src/main.rs4
2 files changed, 14 insertions, 14 deletions
diff --git a/mullvad-cli/src/cmds/api_access.rs b/mullvad-cli/src/cmds/api_access.rs
index e9bf6f9b32..7b7656ca6a 100644
--- a/mullvad-cli/src/cmds/api_access.rs
+++ b/mullvad-cli/src/cmds/api_access.rs
@@ -10,22 +10,22 @@ use talpid_types::net::openvpn::SHADOWSOCKS_CIPHERS;
#[derive(Subcommand, Debug, Clone)]
pub enum ApiAccess {
- /// List the configured API proxies
+ /// List the configured API access methods
List,
- /// Add a custom API proxy
+ /// Add a custom API access method
#[clap(subcommand)]
Add(AddCustomCommands),
- /// Edit an API proxy
+ /// Edit an API access method
Edit(EditCustomCommands),
- /// Remove an API proxy
+ /// Remove an API access method
Remove(SelectItem),
- /// Enable an API proxy
+ /// Enable an API access method
Enable(SelectItem),
- /// Disable an API proxy
+ /// Disable an API access method
Disable(SelectItem),
- /// Test an API proxy
+ /// Test an API access method
Test(SelectItem),
- /// Force the use of a specific API proxy.
+ /// Force the use of a specific API access method.
///
/// Selecting "Mullvad Bridges" respects your current bridge settings.
Use(SelectItem),
@@ -74,8 +74,8 @@ impl ApiAccess {
/// Add a custom API access method.
async fn add(cmd: AddCustomCommands) -> Result<()> {
let mut rpc = MullvadProxyClient::new().await?;
- let proxy = ApiAccessMethod::try_from(cmd)?;
- rpc.add_access_method(proxy).await?;
+ let access_method = ApiAccessMethod::try_from(cmd)?;
+ rpc.add_access_method(access_method).await?;
Ok(())
}
@@ -274,7 +274,7 @@ impl std::fmt::Display for SelectItem {
#[derive(Args, Debug, Clone)]
pub struct EditCustomCommands {
- /// Which API proxy to edit
+ /// Which API access method to edit
#[clap(flatten)]
item: SelectItem,
/// Editing parameters
@@ -284,7 +284,7 @@ pub struct EditCustomCommands {
#[derive(Args, Debug, Clone)]
pub struct EditParams {
- /// Name of the API proxy in the Mullvad client [All]
+ /// Name of the API access method in the Mullvad client [All]
#[arg(long)]
name: Option<String>,
/// Password for authentication [Shadowsocks]
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index 27855ded69..a79465f965 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -71,8 +71,8 @@ enum Cli {
#[clap(subcommand)]
Relay(relay::Relay),
- /// Manage use of proxies for reaching the Mullvad API.
- /// Can make the daemon connect to the the Mullvad API via one of the
+ /// Manage use of access methods for reaching the Mullvad API.
+ /// Can be used to connect to the the Mullvad API via one of the
/// Mullvad bridge servers or a custom proxy (SOCKS5 & Shadowsocks).
#[clap(subcommand)]
ApiAccess(api_access::ApiAccess),