diff --git a/CHANGELOG.md b/CHANGELOG.md index ac136fda1..955330669 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -374,7 +374,7 @@ Current [release](https://github.com/sosedoff/pgweb/releases) is `0.16.2`. ## 0.6.0 - 2015-05-31 - Adds ability to execute only selected SQL query in run command view, [GH-85] -- Adds ability to delete/truncate table via context meny on sidebar view +- Adds ability to delete/truncate table via context many on sidebar view - Adds ability to export table contents to CSV via context menu on sidebar view - Changes sidebar color scheme to a lighter and better looking one @@ -388,7 +388,7 @@ Current [release](https://github.com/sosedoff/pgweb/releases) is `0.16.2`. ## 0.5.2 - 2015-04-13 -- Adds a new endpoint /activity that retuns active queries +- Adds a new endpoint /activity that returns active queries - Adds tab to view active queries - Adds column sorting when browsing table contents - Fixes SQL query view when switching to table structure view diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f93913a0c..7f6ae51e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,6 @@ - Create a new git branch - Make changes - Run tests: `make test` -- Run tests agains all supported PostreSQL versions: `make test-all` (optional) +- Run tests against all supported PostreSQL versions: `make test-all` (optional) - If you change frontend code (js/css) make sure to rebuild assets: `make assets` - Open a new pull request \ No newline at end of file diff --git a/config/examples/connect_backend_ruby/main.rb b/config/examples/connect_backend_ruby/main.rb index 6fd6fd7dc..52d492985 100644 --- a/config/examples/connect_backend_ruby/main.rb +++ b/config/examples/connect_backend_ruby/main.rb @@ -3,7 +3,7 @@ # Authentication token $token = "test" -# List of all availble resources +# List of all available resources $resources = { "id1" => "postgres://localhost:5432/db1?sslmode=disable", "id2" => "postgres://localhost:5432/db2?sslmode=disable", diff --git a/pkg/cli/cli.go b/pkg/cli/cli.go index 866738161..9ac45c57a 100644 --- a/pkg/cli/cli.go +++ b/pkg/cli/cli.go @@ -215,7 +215,7 @@ func startServer() { err := router.Run(fmt.Sprintf("%v:%v", options.HTTPHost, options.HTTPPort)) if err != nil { - fmt.Println("Cant start server:", err) + fmt.Println("Can't start server:", err) if strings.Contains(err.Error(), "address already in use") { openPage() } diff --git a/pkg/command/options.go b/pkg/command/options.go index 4e17b01e5..0088a8b21 100644 --- a/pkg/command/options.go +++ b/pkg/command/options.go @@ -181,7 +181,7 @@ func ParseOptions(args []string) (Options, error) { homePath, err := homedir.Dir() if err != nil { - fmt.Fprintf(os.Stderr, "[WARN] cant detect home dir: %v", err) + fmt.Fprintf(os.Stderr, "[WARN] can't detect home dir: %v", err) homePath = os.Getenv("HOME") }