Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-05-01 12:12:10 +0200
committerAnton Hvornum <anton@hvornum.se>2021-05-01 12:12:10 +0200
commitea0d0a88174dbf7d8cad7d957ab3fd2ca00e02a4 (patch)
tree5ba03b7e2ecc37b72cb83f3a8908ab747028f695 /docs
parenta7c0142099066791d48240815c47c07772f9e025 (diff)
parentb58bec202ab47259d5a3855032aca70fa8f36b91 (diff)
Merge branch 'master' of https://github.com/archlinux/archinstall into torxed-partitioning
Diffstat (limited to 'docs')
-rw-r--r--docs/archinstall/general.rst2
-rw-r--r--docs/pull_request_template.md18
2 files changed, 4 insertions, 16 deletions
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