diff --git a/ChangeLog b/ChangeLog index 79e8f5ca..60cdd0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -461,7 +461,7 @@ Version 2.0.13 (Nov 25, 2018) * Add man page * Add support for Systemd Socket Activation (experimental) -* Add the possiblity to listen on Unix sockets +* Add the possibility to listen on Unix sockets * Add config options to disable HTTP and scheduler services * Archive more read entries in cleanup job * Change default database connection string (backward compatible) diff --git a/cli/cli.go b/cli/cli.go index 084765c6..6a80f8d6 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -171,7 +171,7 @@ func Parse() { return } - // Run migrations and start the deamon. + // Run migrations and start the daemon. if config.Opts.RunMigrations() { if err := database.Migrate(db); err != nil { logger.Fatal(`%v`, err) @@ -182,7 +182,7 @@ func Parse() { logger.Fatal(`You must run the SQL migrations, %v`, err) } - // Create admin user and start the deamon. + // Create admin user and start the daemon. if config.Opts.CreateAdmin() { createAdmin(store) } diff --git a/client/client.go b/client/client.go index 03729767..fe0c7310 100644 --- a/client/client.go +++ b/client/client.go @@ -222,7 +222,7 @@ func (c *Client) MarkCategoryAsRead(categoryID int64) error { return err } -// CategoryFeeds gets feeds of a cateogry. +// CategoryFeeds gets feeds of a category. func (c *Client) CategoryFeeds(categoryID int64) (Feeds, error) { body, err := c.request.Get(fmt.Sprintf("/v1/categories/%d/feeds", categoryID)) if err != nil { diff --git a/storage/icon.go b/storage/icon.go index af7f323d..57e6a6fb 100644 --- a/storage/icon.go +++ b/storage/icon.go @@ -116,7 +116,7 @@ func (s *Storage) CreateFeedIcon(feedID int64, icon *model.Icon) error { return nil } -// Icons returns all icons tht belongs to a user. +// Icons returns all icons that belongs to a user. func (s *Storage) Icons(userID int64) (model.Icons, error) { query := ` SELECT diff --git a/storage/job.go b/storage/job.go index 5b10468a..447b87e7 100644 --- a/storage/job.go +++ b/storage/job.go @@ -11,7 +11,7 @@ import ( "miniflux.app/model" ) -// NewBatch returns a serie of jobs. +// NewBatch returns a series of jobs. func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) { pollingParsingErrorLimit := config.Opts.PollingParsingErrorLimit() query := ` @@ -28,7 +28,7 @@ func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) { return s.fetchBatchRows(query, pollingParsingErrorLimit, batchSize) } -// NewUserBatch returns a serie of jobs but only for a given user. +// NewUserBatch returns a series of jobs but only for a given user. func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) { // We do not take the error counter into consideration when the given // user refresh manually all his feeds to force a refresh. diff --git a/template/functions.go b/template/functions.go index 7ae17d24..d705f098 100644 --- a/template/functions.go +++ b/template/functions.go @@ -88,7 +88,7 @@ func (f *funcMap) Map() template.FuncMap { )) }, - // These functions are overrided at runtime after the parsing. + // These functions are overrode at runtime after the parsing. "elapsed": func(timezone string, t time.Time) string { return "" },