summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/auth/auth.go2
-rw-r--r--modules/auth/ldap/ldap.go4
-rw-r--r--modules/avatar/avatar.go2
-rw-r--r--modules/ldap/debug.go2
-rw-r--r--modules/log/log.go2
-rw-r--r--modules/mahonia/charset.go2
-rw-r--r--modules/middleware/repo.go2
-rw-r--r--modules/setting/setting.go2
8 files changed, 9 insertions, 9 deletions
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index 450cdb37e9..acf4bf02ef 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -80,7 +80,7 @@ func SignedInUser(req *http.Request, sess session.Store) (*models.User, bool) {
return nil, false
}
- // Check if enabled auto-registeration.
+ // Check if enabled auto-registration.
if setting.Service.EnableReverseProxyAutoRegister {
u := &models.User{
Name: webAuthUser,
diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go
index 79b59519e2..44c130a104 100644
--- a/modules/auth/ldap/ldap.go
+++ b/modules/auth/ldap/ldap.go
@@ -20,7 +20,7 @@ type Ldapsource struct {
Port int // port number
UseSSL bool // Use SSL
BaseDN string // Base DN
- Attributes string // Attribut to search
+ Attributes string // Attribute to search
Filter string // Query filter to validate entry
MsAdSAFormat string // in the case of MS AD Simple Authen, the format to use (see: http://msdn.microsoft.com/en-us/library/cc223499.aspx)
Enabled bool // if this source is disabled
@@ -37,7 +37,7 @@ func AddSource(name string, host string, port int, usessl bool, basedn string, a
Authensource = append(Authensource, ldaphost)
}
-//LoginUser : try to login an user to LDAP sources, return requested (attribut,true) if ok, ("",false) other wise
+//LoginUser : try to login an user to LDAP sources, return requested (attribute,true) if ok, ("",false) other wise
//First match wins
//Returns first attribute if exists
func LoginUser(name, passwd string) (a string, r bool) {
diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go
index 225d6c8183..c0a71f11de 100644
--- a/modules/avatar/avatar.go
+++ b/modules/avatar/avatar.go
@@ -46,7 +46,7 @@ func init() {
}
// hash email to md5 string
-// keep this func in order to make this package indenpent
+// keep this func in order to make this package independent
func HashEmail(email string) string {
// https://en.gravatar.com/site/implement/hash/
email = strings.TrimSpace(email)
diff --git a/modules/ldap/debug.go b/modules/ldap/debug.go
index 8653a47b45..67856fe7a6 100644
--- a/modules/ldap/debug.go
+++ b/modules/ldap/debug.go
@@ -6,7 +6,7 @@ import (
"github.com/gogits/gogs/modules/asn1-ber"
)
-// debbuging type
+// debugging type
// - has a Printf method to write the debug output
type debugging bool
diff --git a/modules/log/log.go b/modules/log/log.go
index 4fb74d40c8..82492ce3fa 100644
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -162,7 +162,7 @@ func newLogger(buffer int64) *Logger {
return l
}
-// SetLogger sets new logger instanse with given logger adapter and config.
+// SetLogger sets new logger instance with given logger adapter and config.
func (l *Logger) SetLogger(adapter string, config string) error {
l.lock.Lock()
defer l.lock.Unlock()
diff --git a/modules/mahonia/charset.go b/modules/mahonia/charset.go
index 14fa3b883a..eef8ed3147 100644
--- a/modules/mahonia/charset.go
+++ b/modules/mahonia/charset.go
@@ -32,7 +32,7 @@ const (
)
// A Decoder is a function that decodes a character set, one character at a time.
-// It works much like utf8.DecodeRune, but has an aditional status return value.
+// It works much like utf8.DecodeRune, but has an additional status return value.
type Decoder func(p []byte) (c rune, size int, status Status)
// An Encoder is a function that encodes a character set, one character at a time.
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 7cc7a6d813..8b0f0c59f7 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -453,7 +453,7 @@ func RequireTrueOwner() macaron.Handler {
}
}
-// GitHookService checks if repsitory Git hooks service has been enabled.
+// GitHookService checks if repository Git hooks service has been enabled.
func GitHookService() macaron.Handler {
return func(ctx *Context) {
if !ctx.User.AllowGitHook && !ctx.User.IsAdmin {
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index b1efc9c7a8..7765a859ab 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -260,7 +260,7 @@ func NewConfigContext() {
log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser)
}
- // Determine and create root git reposiroty path.
+ // Determine and create root git repository path.
homeDir, err := com.HomeDir()
if err != nil {
log.Fatal(4, "Fail to get home directory: %v", err)