index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Владислав <awayfromgalaxy@gmail.com> | 2021-04-27 15:18:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-27 15:18:02 +0300 |
commit | 0c6ebc7e809cabcd2aacf3e13daf5327142f3b31 (patch) | |
tree | e4ff0e9cdd04b70f83eed822fcdec067f5b2094f /docs | |
parent | 985b7fac3ff400de9954d441480ab795222f4b24 (diff) | |
parent | ae1c4ea7c2a1d56b23c843a2318c1400ebebb1af (diff) |
-rw-r--r-- | docs/archinstall/general.rst | 2 | ||||
-rw-r--r-- | docs/pull_request_template.md | 18 |
diff --git a/docs/archinstall/general.rst b/docs/archinstall/general.rst index c3913ea9..7319d244 100644 --- a/docs/archinstall/general.rst +++ b/docs/archinstall/general.rst @@ -12,7 +12,7 @@ Packages ======== .. autofunction:: archinstall.find_package - +Be .. autofunction:: archinstall.find_packages Locale related diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md index c2f694ce..729c1aae 100644 --- a/docs/pull_request_template.md +++ b/docs/pull_request_template.md @@ -2,18 +2,8 @@ # New features *(v2.2.0)* -Merge new features in to `torxed-v2.2.0`.<br> -This branch is designated for potential breaking changes, added complexity and new functionality. - -# Bug fixes *(v2.1.4)* - -Merge against `master` for bug fixes and anything that improves stability and quality of life.<br> -This excludes: - * New functionality - * Added complexity - * Breaking changes - -Any changes to `master` automatically gets pulled in to `torxed-v2.2.0` to avoid merge hell. +All future work towards *`v2.2.0`* is done against `master` now.<br> +Any patch work to existing verions will have to create a new branch against the tagged versions. # Describe your PR @@ -23,6 +13,4 @@ If the PR is larger than ~20 lines, please describe it here unless described in # Testing Any new feature or stability improvement should be tested if possible. -Please follow the test instructions at the bottom of the README. - -*These PR guidelines will change after 2021-05-01, which is when `v2.1.4` gets onto the new ISO* +Please follow the test instructions at the bottom of the README or use the ISO built on each PR.
\ No newline at end of file |