summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
Diffstat (limited to 'model')
-rw-r--r--model/client.go6
-rw-r--r--model/config.go2
-rw-r--r--model/websocket_client.go4
3 files changed, 6 insertions, 6 deletions
diff --git a/model/client.go b/model/client.go
index ef890b593..b56043a92 100644
--- a/model/client.go
+++ b/model/client.go
@@ -72,7 +72,7 @@ type Client struct {
ServerVersion string
}
-// NewClient constructs a new client with convienence methods for talking to
+// NewClient constructs a new client with convenience methods for talking to
// the server.
func NewClient(url string) *Client {
return &Client{url, url + API_URL_SUFFIX_V3, &http.Client{}, "", "", "", "", "", ""}
@@ -257,7 +257,7 @@ func (c *Client) clearExtraProperties() {
// General Routes Section
// GetClientProperties returns properties needed by the client to show/hide
-// certian features. It returns a map of strings.
+// certain features. It returns a map of strings.
func (c *Client) GetClientProperties() (map[string]string, *AppError) {
c.clearExtraProperties()
if r, err := c.DoApiGet(c.GetGeneralRoute()+"/client_props", "", ""); err != nil {
@@ -2231,7 +2231,7 @@ func (c *Client) GetCustomEmojiImageUrl(id string) string {
// Uploads a x509 base64 Certificate or Private Key file to be used with SAML.
// data byte array is required and needs to be a Multi-Part with 'certificate' as the field name
-// contentType is also required. Returns nil if succesful, otherwise returns an AppError
+// contentType is also required. Returns nil if successful, otherwise returns an AppError
func (c *Client) UploadCertificateFile(data []byte, contentType string) *AppError {
url := c.ApiUrl + "/admin/add_certificate"
rq, _ := http.NewRequest("POST", url, bytes.NewReader(data))
diff --git a/model/config.go b/model/config.go
index 17a0aafbf..c2b514c33 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1128,7 +1128,7 @@ type LdapSettings struct {
IdAttribute *string
PositionAttribute *string
- // Syncronization
+ // Synchronization
SyncIntervalMinutes *int
// Advanced
diff --git a/model/websocket_client.go b/model/websocket_client.go
index e5c44dde8..cdec75aba 100644
--- a/model/websocket_client.go
+++ b/model/websocket_client.go
@@ -26,7 +26,7 @@ type WebSocketClient struct {
ListenError *AppError
}
-// NewWebSocketClient constructs a new WebSocket client with convienence
+// NewWebSocketClient constructs a new WebSocket client with convenience
// methods for talking to the server.
func NewWebSocketClient(url, authToken string) (*WebSocketClient, *AppError) {
conn, _, err := websocket.DefaultDialer.Dial(url+API_URL_SUFFIX_V3+"/users/websocket", nil)
@@ -51,7 +51,7 @@ func NewWebSocketClient(url, authToken string) (*WebSocketClient, *AppError) {
return client, nil
}
-// NewWebSocketClient4 constructs a new WebSocket client with convienence
+// NewWebSocketClient4 constructs a new WebSocket client with convenience
// methods for talking to the server. Uses the v4 endpoint.
func NewWebSocketClient4(url, authToken string) (*WebSocketClient, *AppError) {
conn, _, err := websocket.DefaultDialer.Dial(url+API_URL_SUFFIX+"/websocket", nil)