Skip to content

Commit

Permalink
Update references to branch master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
duck-rh committed Jun 27, 2022
1 parent eff2092 commit 5113476
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Changes proposed in this pull request:

-

I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/master/CONTRIBUTING.md): (please @mention yourself to sign)
I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/main/CONTRIBUTING.md): (please @mention yourself to sign)

This pull request needs review by: (please @mention the reviewer if relevant)
40 changes: 23 additions & 17 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,43 @@ and assign issues to other contributors.
This section describes the typical tasks and processes to follow as a maintainer.

IMPORTANT: Because maintainers have commit access to the repository, please fork and clone
the repository and submit Pull Requests. Avoid direct commits to the master branch.
All contributions must follow the [general contribution guidelines](https://github.com/oVirt/ovirt-site/blob/master/CONTRIBUTING.md).
the repository and submit Pull Requests. Avoid direct commits to the main branch.
All contributions must follow the [general contribution guidelines](https://github.com/oVirt/ovirt-site/blob/main/CONTRIBUTING.md).

See [CONTRIBUTING.md](CONTRIBUTING.md) for instructions on building and testing the site locally.

## List of current site maintainers

### General technical content, release management
* Sandro Bonazzola [[email protected]](mailto:[email protected])
* Greg Sheremeta [[email protected]](mailto:[email protected])
* Nir Soffer
* Doron Fediuck

- Sandro Bonazzola [[email protected]](mailto:[email protected])
- Greg Sheremeta [[email protected]](mailto:[email protected])
- Nir Soffer
- Doron Fediuck

### Site infra and Jekyll
* Marc Dequenes (Duck)
* Greg Sheremeta [[email protected]](mailto:[email protected])

- Marc Dequenes (Duck)
- Greg Sheremeta [[email protected]](mailto:[email protected])

### Non-technical content, community, legal
* Brian Proffit

- Brian Proffit

## Previous maintainers
* Yaniv Kaul
* Allon Mureinik (storage)
* Marcin Mirecki (networking)
* Eyal Edri (infra)
* Garrett LeSage
* Jason Brooks
* Michael Scherer

- Yaniv Kaul
- Allon Mureinik (storage)
- Marcin Mirecki (networking)
- Eyal Edri (infra)
- Garrett LeSage
- Jason Brooks
- Michael Scherer

## Triaging and reviewing issues and PRs
* Greg Sheremeta and Sandro Bonazzola triage issues and PRs. Greg Sheremeta reviews all documentation edits for content and grammar.

- Greg Sheremeta and Sandro Bonazzola triage issues and PRs. Greg Sheremeta reviews all documentation edits for content and grammar.

## Reviewing and merging pull requests

Follow these best practices for all PRs, including yours. Do not merge your own PRs unless it is a quick and very safe fix, and make sure to test the change before and after you process the PR.
2 changes: 1 addition & 1 deletion source/_includes/footer.haml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
- issue_url = "https://github.com/#{site.data.site.github}/issues/new?labels=#{labels}&title=Issue:%20#{page.url}&template=#{issue_template}"
%a{ :href => issue_url, :title => "Report an issue", :target => "_blank" }= "#{icon}Report an issue with this page"
.edit-this-page
- edit_url = "https://github.com/#{site.data.site.github}/edit/master/#{[site['source'], page.path].join('/')}"
- edit_url = "https://github.com/#{site.data.site.github}/edit/main/#{[site['source'], page.path].join('/')}"
%a{ :href => edit_url, :title => "Edit this page", :target => "_blank" }= "#{icon}Edit this page"

= insert_piwik_tracker
4 changes: 2 additions & 2 deletions source/community/about/contributing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Changes proposed in this pull request:
-
I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/master/CONTRIBUTING.md): (please @mention yourself to sign)
I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/main/CONTRIBUTING.md): (please @mention yourself to sign)
This pull request needs review by: (please @mention the reviewer if relevant)
Expand All @@ -143,7 +143,7 @@ Changes proposed in this pull request:
* This PR adds a module to describe the new dashboard feature.
I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/master/CONTRIBUTING.md): @ploni)
I confirm that this pull request was submitted according to the [contribution guidelines](https://github.com/oVirt/ovirt-site/blob/main/CONTRIBUTING.md): @ploni)
This pull request needs review by: @octocat
----
Expand Down
44 changes: 22 additions & 22 deletions source/community/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ hide_metadata: true
# Get involved!

oVirt is a community-driven virtualization project and people just like you are making it happen.

</section>

<section class="container">
Expand All @@ -26,23 +27,22 @@ The oVirt community is a group of multidisciplinary individuals who are contribu

Before getting started, we recommend that you:

* Sign up for the [[email protected] mailing list](/community/users-list.html) and send us an email saying how you would like to contribute. Visit our [mailing lists](/community/about/mailing-lists.html) page for other oVirt mailing lists to sign up for.
* For fluent, real time communication, [join us on IRC](/community/about/contact.html#irc)
* Please read our [community etiquette guidelines](/community/about/community-guidelines.html). (Quick summary: Be nice!)

- Sign up for the [[email protected] mailing list](/community/users-list.html) and send us an email saying how you would like to contribute. Visit our [mailing lists](/community/about/mailing-lists.html) page for other oVirt mailing lists to sign up for.
- For fluent, real time communication, [join us on IRC](/community/about/contact.html#irc)
- Please read our [community etiquette guidelines](/community/about/community-guidelines.html). (Quick summary: Be nice!)

# Community

oVirt is a community project, and we welcome contributions from everyone! If you'd like to write code, report bugs, contribute designs, or enhance the documentation, we would love your help!

There are a few ways to engage with the oVirt Community:

* [Events](/events/)
* [Archived Conferences Presentations](archived_conferences_presentations.html)
* [Forums / Mailing lists](https://lists.ovirt.org/archives/)
* [oVirt Facebook group](https://www.facebook.com/groups/ovirt.openvirtualization/)
* [Twitter](https://twitter.com/ovirt)
* IRC -- `#ovirt` on `irc.oftc.net`
- [Events](/events/)
- [Archived Conferences Presentations](archived_conferences_presentations.html)
- [Forums / Mailing lists](https://lists.ovirt.org/archives/)
- [oVirt Facebook group](https://www.facebook.com/groups/ovirt.openvirtualization/)
- [Twitter](https://twitter.com/ovirt)
- IRC -- `#ovirt` on `irc.oftc.net`

Before getting started, please read our [community etiquette guidelines](/community/about/community-guidelines.html).

Expand All @@ -67,16 +67,16 @@ To contribute translations, please follow our [How-To](/develop/localization.htm

## Documentation

oVirt needs concise, user-friendly, up-to-date installation and usage documentation. To contribute, visit the [documentation repository](https://github.com/oVirt/ovirt-site/tree/master/source/documentation) and the [documentation issues tracker](https://github.com/oVirt/ovirt-site/issues?q=is%3Aissue+is%3Aopen+label%3Adocumentation). You can also report any documentation issues you find by clicking "Report an issue with this page" at the bottom of the documentation.
oVirt needs concise, user-friendly, up-to-date installation and usage documentation. To contribute, visit the [documentation repository](https://github.com/oVirt/ovirt-site/tree/main/source/documentation) and the [documentation issues tracker](https://github.com/oVirt/ovirt-site/issues?q=is%3Aissue+is%3Aopen+label%3Adocumentation). You can also report any documentation issues you find by clicking "Report an issue with this page" at the bottom of the documentation.

## Report Bugs and New Feature Requests (RFEs)

Reporting bugs is one of the most valuable ways you can contribute! Ideas for new features are also very welcome. Report bugs and RFEs using the following issue trackers:

* [Bugzilla - how to report a bug](/community/report-a-bug.html)
* [VM Portal GitHub - bugs and RFEs in VM Portal](https://github.com/oVirt/ovirt-web-ui/issues)
* [oVirt Documentation GitHub - Documentation issues](https://github.com/oVirt/ovirt-site/issues?q=is%3Aissue+is%3Aopen+label%3Adocumentation)
* Security issues follow a [special reporting procedure](/community/security.html).
- [Bugzilla - how to report a bug](/community/report-a-bug.html)
- [VM Portal GitHub - bugs and RFEs in VM Portal](https://github.com/oVirt/ovirt-web-ui/issues)
- [oVirt Documentation GitHub - Documentation issues](https://github.com/oVirt/ovirt-site/issues?q=is%3Aissue+is%3Aopen+label%3Adocumentation)
- Security issues follow a [special reporting procedure](/community/security.html).

## Monitor security reports for oVirt Node

Expand All @@ -103,18 +103,18 @@ oVirt has a broad community of [supporters, sponsors, and providers](/community/

Follow us on:

* [Twitter](https://twitter.com/ovirt)
* [Facebook](https://www.facebook.com/groups/ovirt.openvirtualization/)
* [YouTube](http://www.youtube.com/user/ovirtproject)
- [Twitter](https://twitter.com/ovirt)
- [Facebook](https://www.facebook.com/groups/ovirt.openvirtualization/)
- [YouTube](http://www.youtube.com/user/ovirtproject)

## Community projects related to oVirt

oVirt community shares scripts, tools, add-ons and plugins that didn't reach enough interest or stability
to get included into the oVirt project.
You can find some of them listed here:

* [oVirt storage balancer](https://github.com/nkovacne/ovirt-storage-balancer)
* [oVirt Simple Backup](https://github.com/zipurman/oVIRT_Simple_Backup)
* [oVirt Desktop Client](https://github.com/nkovacne/ovirt-desktop-client)
* [oVirt filesystem in userspace](https://github.com/yuvalturg/ovirtfs)
- [oVirt storage balancer](https://github.com/nkovacne/ovirt-storage-balancer)
- [oVirt Simple Backup](https://github.com/zipurman/oVIRT_Simple_Backup)
- [oVirt Desktop Client](https://github.com/nkovacne/ovirt-desktop-client)
- [oVirt filesystem in userspace](https://github.com/yuvalturg/ovirtfs)
</section>

0 comments on commit 5113476

Please sign in to comment.