Skip to content

Commit

Permalink
update master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
ddollar committed Apr 12, 2024
1 parent d3a34ed commit d5fac29
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,43 @@ Manage Procfile-based applications

$ gem install foreman

Ruby users should take care *not* to install foreman in their project's `Gemfile`. See this [wiki article](https://github.com/ddollar/foreman/wiki/Don't-Bundle-Foreman) for more details.
Ruby users should take care _not_ to install foreman in their project's `Gemfile`. See this [wiki article](https://github.com/ddollar/foreman/wiki/Don't-Bundle-Foreman) for more details.

## Getting Started

* http://blog.daviddollar.org/2011/05/06/introducing-foreman.html
- http://blog.daviddollar.org/2011/05/06/introducing-foreman.html

## Supported Ruby versions

See [ci.yml](.github/workflows/ci.yml) for a list of Ruby versions against which Foreman is tested.

## Documentation

* [man page](http://ddollar.github.io/foreman/)
* [wiki](https://github.com/ddollar/foreman/wiki)
* [changelog](https://github.com/ddollar/foreman/blob/master/Changelog.md)
- [man page](http://ddollar.github.io/foreman/)
- [wiki](https://github.com/ddollar/foreman/wiki)
- [changelog](https://github.com/ddollar/foreman/blob/main/Changelog.md)

## Ports

* [forego](https://github.com/ddollar/forego) - Go
* [node-foreman](https://github.com/strongloop/node-foreman) - Node.js
* [gaffer](https://github.com/jingweno/gaffer) - Java/JVM
* [goreman](https://github.com/mattn/goreman) - Go
* [honcho](https://github.com/nickstenning/honcho) - python
* [proclet](https://github.com/kazeburo/Proclet) - Perl
* [shoreman](https://github.com/chrismytton/shoreman) - shell
* [crank](https://github.com/arktisklada/crank) - Crystal
* [houseman](https://github.com/fujimura/houseman) - Haskell
* [spm](https://github.com/bytegust/spm) - Go
- [forego](https://github.com/ddollar/forego) - Go
- [node-foreman](https://github.com/strongloop/node-foreman) - Node.js
- [gaffer](https://github.com/jingweno/gaffer) - Java/JVM
- [goreman](https://github.com/mattn/goreman) - Go
- [honcho](https://github.com/nickstenning/honcho) - python
- [proclet](https://github.com/kazeburo/Proclet) - Perl
- [shoreman](https://github.com/chrismytton/shoreman) - shell
- [crank](https://github.com/arktisklada/crank) - Crystal
- [houseman](https://github.com/fujimura/houseman) - Haskell
- [spm](https://github.com/bytegust/spm) - Go

## Authors

#### Created and maintained by

David Dollar

#### Patches contributed by

[Contributor List](https://github.com/ddollar/foreman/contributors)

## License
Expand Down
2 changes: 1 addition & 1 deletion lib/foreman/engine/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def color(name)

def startup
@colors = map_colors
proctitle "foreman: master" unless Foreman.windows?
proctitle "foreman: main" unless Foreman.windows?
Color.enable($stdout, options[:color])
end

Expand Down
4 changes: 2 additions & 2 deletions lib/foreman/export/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ def self.warn_deprecation!
puts "WARNING: Using deprecated exporter interface. Please update your exporter"
puts "the interface shown in the upstart exporter:"
puts
puts "https://github.com/ddollar/foreman/blob/master/lib/foreman/export/upstart.rb"
puts "https://github.com/ddollar/foreman/blob/master/data/export/upstart/process.conf.erb"
puts "https://github.com/ddollar/foreman/blob/main/lib/foreman/export/upstart.rb"
puts "https://github.com/ddollar/foreman/blob/main/data/export/upstart/process.conf.erb"
puts
@@deprecation_warned = true
end
Expand Down
2 changes: 1 addition & 1 deletion tasks/release.rake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ task :pages => "man:commit" do
git add -u index.html
git commit -m "saving man page to github docs"
git push origin -f gh-pages
git checkout master
git checkout main
}
end

Expand Down

0 comments on commit d5fac29

Please sign in to comment.