diff options
| -rw-r--r-- | modules/Policies/nav.adoc | 2 | ||||
| -rw-r--r-- | modules/Policies/pages/conflicts.adoc | 14 | ||||
| -rw-r--r-- | modules/Policies/pages/short.adoc | 8 |
3 files changed, 0 insertions, 24 deletions
diff --git a/modules/Policies/nav.adoc b/modules/Policies/nav.adoc index 82ae1a8..2a0f2b4 100644 --- a/modules/Policies/nav.adoc +++ b/modules/Policies/nav.adoc @@ -1,5 +1,3 @@ .Policies * xref:voting.adoc[Voting Process] -* xref:conflicts.adoc[Conflict Resolution] * xref:update.adoc[Updating Policies] -* xref:short.adoc[Misc] diff --git a/modules/Policies/pages/conflicts.adoc b/modules/Policies/pages/conflicts.adoc deleted file mode 100644 index bf63013..0000000 --- a/modules/Policies/pages/conflicts.adoc +++ /dev/null @@ -1,14 +0,0 @@ -= Conflict Resolution - -Sometimes, conflicts between teams arise. -This document describes how to handle these situations. - -== Conflicts Between a Team and Project Policy -If a team wishes to disobey a project-wide policy, they *must* do so with the explicit approval of the rest of the project. -This approval *must* be gotten through a xref:voting.adoc[Vote]. -Doing otherwise is grounds for dissolution. - -== Conflicts Between a Subteam and its Parent -If a parent team disagrees with a child, the team with the highest specificity normally wins out. -For example, if the packaging team and the python team disagree on a flag to pass to python's configure script, the python team has priority. -If the parent team believes the matter to be vital, they may call for a xref:voting.adoc[Vote]. diff --git a/modules/Policies/pages/short.adoc b/modules/Policies/pages/short.adoc deleted file mode 100644 index 81c13d2..0000000 --- a/modules/Policies/pages/short.adoc +++ /dev/null @@ -1,8 +0,0 @@ -= Shorter Policies - -Not every policy needs its own page. -Policies that are sufficiently short to be held together can be found here. - -== Tabs vs Spaces in Aports -Use tabs in APKBUILD files. -This should be easy if your editor has an editorconfig plugin. |