diff options
| -rw-r--r-- | cmd/cmd.go | 2 | ||||
| -rw-r--r-- | docs/content/doc/advanced/logging-documentation.en-us.md | 2 | ||||
| -rw-r--r-- | models/migrations/migrations.go | 4 | ||||
| -rw-r--r-- | modules/indexer/issues/bleve_test.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/repo/milestone.go | 2 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cmd/cmd.go b/cmd/cmd.go index 3846a86900..36d54bb19f 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -68,7 +68,7 @@ Ensure you are running in the correct environment or set the correct configurati If this is the intended configuration file complete the [database] section.`, setting.CustomConf) } if err := db.InitEngine(ctx); err != nil { - return fmt.Errorf("unable to initialise the database using the configuration in %q. Error: %v", setting.CustomConf, err) + return fmt.Errorf("unable to initialize the database using the configuration in %q. Error: %v", setting.CustomConf, err) } return nil } diff --git a/docs/content/doc/advanced/logging-documentation.en-us.md b/docs/content/doc/advanced/logging-documentation.en-us.md index bdde5bd8c4..b519641591 100644 --- a/docs/content/doc/advanced/logging-documentation.en-us.md +++ b/docs/content/doc/advanced/logging-documentation.en-us.md @@ -349,7 +349,7 @@ recommended that pausing only done for a very short period of time. It is possible to add and remove logging whilst Gitea is running using the `gitea manager logging add` and `remove` subcommands. This functionality can only adjust running log systems and cannot be used to start the access or router loggers if they -were not already initialised. If you wish to start these systems you are advised to adjust the app.ini and (gracefully) restart +were not already initialized. If you wish to start these systems you are advised to adjust the app.ini and (gracefully) restart the Gitea service. The main intention of these commands is to easily add a temporary logger to investigate problems on running systems where a restart diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 5a2297ac0d..1bed4e2bc0 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -419,7 +419,7 @@ func EnsureUpToDate(x *xorm.Engine) error { } if currentDB < 0 { - return fmt.Errorf("Database has not been initialised") + return fmt.Errorf("Database has not been initialized") } if minDBVersion > currentDB { @@ -953,7 +953,7 @@ func dropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin return nil } -// modifyColumn will modify column's type or other propertity. SQLITE is not supported +// modifyColumn will modify column's type or other property. SQLITE is not supported func modifyColumn(x *xorm.Engine, tableName string, col *schemas.Column) error { var indexes map[string]*schemas.Index var err error diff --git a/modules/indexer/issues/bleve_test.go b/modules/indexer/issues/bleve_test.go index 926c32e242..68a7831a3f 100644 --- a/modules/indexer/issues/bleve_test.go +++ b/modules/indexer/issues/bleve_test.go @@ -26,7 +26,7 @@ func TestBleveIndexAndSearch(t *testing.T) { defer indexer.Close() if _, err := indexer.Init(); err != nil { - assert.Fail(t, "Unable to initialise bleve indexer: %v", err) + assert.Fail(t, "Unable to initialize bleve indexer: %v", err) return } diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index ce6aa7f46f..0e8800510b 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -39,7 +39,7 @@ func ListMilestones(ctx *context.APIContext) { // required: true // - name: state // in: query - // description: Milestone state, Recognised values are open, closed and all. Defaults to "open" + // description: Milestone state, Recognized values are open, closed and all. Defaults to "open" // type: string // - name: name // in: query diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index c23bcb2e9a..ecc17b51c8 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -7223,7 +7223,7 @@ }, { "type": "string", - "description": "Milestone state, Recognised values are open, closed and all. Defaults to \"open\"", + "description": "Milestone state, Recognized values are open, closed and all. Defaults to \"open\"", "name": "state", "in": "query" }, |