Merge branch '5.1' into 5

silverstripe · Oct 25, 2023 · 9a87676 · 9a87676
2 parents 7ebf3cd + f002554
commit 9a87676
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 11 deletions.
diff --git a/en/05_Contributing/06_Documentation.md → en/05_Contributing/02_Documentation.md b/en/05_Contributing/06_Documentation.md → en/05_Contributing/02_Documentation.md
diff --git a/en/05_Contributing/07_Translations.md → en/05_Contributing/03_Translations.md b/en/05_Contributing/07_Translations.md → en/05_Contributing/03_Translations.md
diff --git a/...Contributing/14_PHP_Coding_Conventions.md → ..._Conventions/01_PHP_Coding_Conventions.md b/...Contributing/14_PHP_Coding_Conventions.md → ..._Conventions/01_PHP_Coding_Conventions.md
diff --git a/...uting/12_JavaScript_Coding_Conventions.md → ...tions/02_JavaScript_Coding_Conventions.md b/...uting/12_JavaScript_Coding_Conventions.md → ...tions/02_JavaScript_Coding_Conventions.md
diff --git a/...Contributing/13_CSS_Coding_Conventions.md → ..._Conventions/03_CSS_Coding_Conventions.md b/...Contributing/13_CSS_Coding_Conventions.md → ..._Conventions/03_CSS_Coding_Conventions.md
diff --git a/en/05_Contributing/05_Coding_Conventions/index.md b/en/05_Contributing/05_Coding_Conventions/index.md
@@ -0,0 +1,9 @@
+---
+title: Coding conventions
+summary: The style guidelines we follow in all of our open source code
+icon: code
+---
+
+# Coding Conventions
+
+[CHILDREN]
diff --git a/en/05_Contributing/02_Build_Tooling.md → en/05_Contributing/06_Build_Tooling.md b/en/05_Contributing/02_Build_Tooling.md → en/05_Contributing/06_Build_Tooling.md
diff --git a/en/05_Contributing/15_Triage_Resources.md → en/05_Contributing/08_Triage_Resources.md b/en/05_Contributing/15_Triage_Resources.md → en/05_Contributing/08_Triage_Resources.md
diff --git a/en/05_Contributing/04_Release_Process.md → en/05_Contributing/09_Release_Process.md b/en/05_Contributing/04_Release_Process.md → en/05_Contributing/09_Release_Process.md
diff --git a/...ntributing/17_Managing_Security_Issues.md → ...ntributing/10_Managing_Security_Issues.md b/...ntributing/17_Managing_Security_Issues.md → ...ntributing/10_Managing_Security_Issues.md
diff --git a/en/05_Contributing/11_Coding_Conventions.md b/en/05_Contributing/11_Coding_Conventions.md
diff --git a/en/05_Contributing/index.md b/en/05_Contributing/index.md
@@ -13,4 +13,4 @@ icon: heart
 
 For more detailed guidance, read one of the following pages:
 
-[CHILDREN]
+[CHILDREN includeFolders]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ icon: heart

		For more detailed guidance, read one of the following pages:

		[CHILDREN]
		[CHILDREN includeFolders]