diff options
| author | Xavier Noria <fxn@hashref.com> | 2018-06-23 08:46:40 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2018-06-23 08:46:40 +0200 |
| commit | 96d2c228e31e5fe9b3159c5c52051c589d3c384f (patch) | |
| tree | 30432892d469056cfe3548de329e89ab1c1bb5c5 | |
| parent | 484f970c6c45af836f89e2bf2169bb15ca273ddd (diff) | |
| download | rails-96d2c228e31e5fe9b3159c5c52051c589d3c384f.tar.gz rails-96d2c228e31e5fe9b3159c5c52051c589d3c384f.tar.bz2 rails-96d2c228e31e5fe9b3159c5c52051c589d3c384f.zip | |
OS X -> macOS [Closes #30313]
[Jon Moss & Xavier Noria]
4 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb index d1b3c434e1..54b0dde7dc 100644 --- a/activerecord/test/cases/adapters/postgresql/connection_test.rb +++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb @@ -151,7 +151,7 @@ module ActiveRecord # When prompted, restart the PostgreSQL server with the # "-m fast" option or kill the individual connection assuming # you know the incantation to do that. - # To restart PostgreSQL 9.1 on OS X, installed via MacPorts, ... + # To restart PostgreSQL 9.1 on macOS, installed via MacPorts, ... # sudo su postgres -c "pg_ctl restart -D /opt/local/var/db/postgresql91/defaultdb/ -m fast" def test_reconnection_after_actual_disconnection_with_verify original_connection_pid = @connection.query("select pg_backend_pid()") diff --git a/guides/source/command_line.md b/guides/source/command_line.md index 58a2d6d30f..7c629f74c8 100644 --- a/guides/source/command_line.md +++ b/guides/source/command_line.md @@ -633,9 +633,9 @@ $ cat config/database.yml # # Install the pg driver: # gem install pg -# On OS X with Homebrew: +# On macOS with Homebrew: # gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On OS X with MacPorts: +# On macOS with MacPorts: # gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config # On Windows: # gem install pg diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt index 145cfb7f74..4ce4d276b7 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt @@ -2,9 +2,9 @@ # # Install the pg driver: # gem install pg -# On OS X with Homebrew: +# On macOS with Homebrew: # gem install pg -- --with-pg-config=/usr/local/bin/pg_config -# On OS X with MacPorts: +# On macOS with MacPorts: # gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config # On Windows: # gem install pg diff --git a/railties/test/app_loader_test.rb b/railties/test/app_loader_test.rb index c7a6bdee1b..93ed68fabb 100644 --- a/railties/test/app_loader_test.rb +++ b/railties/test/app_loader_test.rb @@ -76,7 +76,7 @@ class AppLoaderTest < ActiveSupport::TestCase # Compare the realpath in case either of them has symlinks. # - # This happens in particular in Mac OS X, where @tmp starts + # This happens in particular in macOS, where @tmp starts # with "/var", and Dir.pwd with "/private/var", due to a # default system symlink var -> private/var. assert_equal File.realpath("#@tmp/foo"), File.realpath(Dir.pwd) |