reorg home

diff --git a/Editing.md b/Editing.md
index 1e84ac946aa7a073dab0a337beba1e14579ad7cd..a000b9c8e82ebd764d6d6b391c4b1a4c989f4ede 100644 (file)
--- a/Editing.md
+++ b/Editing.md
@@ -2,7 +2,18 @@ If you want write access, please ask for it at [#xonotic on FreeNode](https://we
 
 The official version is on [GitLab](https://gitlab.com/xonotic/xonotic/wikis/home) but we also sync the wiki to [GitHub](https://github.com/xonotic/xonotic/wiki). Please, follow this guide when editing to make sure everything works properly on both.
 
-Filenames
+
+Links to pages
+-------------
+
+Use standard markdown links: `[Text](link)` (e.g. `[Back to main page](Home)` to get [Back to main page](Home))
+
+ - Don't prefix `link` with either `../link` or `/link` - both break on GitHub. Using `./link` seems to work ok but is unnecessary since we have to put everything in root anyway.
+
+Links don't seem to be case sensitive but it's probably best to use proper capitalization just in case it breaks in some edge case somewhere. Also, spaces and dashes seem to be freely interchangeable on GH and GL but again, probably best to use dashes.
+
+
+New files
 ---------
 
 For pages, capitalize at least the first letter of the filename (GitHub doesn't capitalize titles automatically, GitLab will do what it wants anyway).
@@ -11,19 +22,8 @@ Use dashes in page names, not underscores - dashes get converted to spaces in pa
 
 Interestingly, spaces in filenames and links seem to work fine for both GitHub and GitLab, not sure if they break somewhere else, it might still be best to avoid them.
 
-Subdirectories
---------------
-
 It's ok (and preferred) to put images and other assets into subdirectories but we have to **put pages in root** becuase GitHub doesn't support subdirs properly (it flattens everything - this can cause collisions, plus there is no way to link from subdir to another subdir that works on both GitLab and GitHub).
 
-Links to pages
--------------
-
-Use standard markdown links: `[Text](link)` (e.g. `[Back to main page](Home)` to get [Back to main page](Home))
-
- - Don't prefix `link` with either `../link` or `/link` - both break on GitHub. Using `./link` seems to work ok but is unnecessary since we have to put everything in root anyway.
-
-Links don't seem to be case sensitive but it's probably best to use proper capitalization just in case it breaks in some edge case somewhere. Also, spaces and dashes seem to be freely interchangeable on GH and GL but again, probably best to use dashes.
 
 Automated checking
 -------------------

diff --git a/Home.md b/Home.md
index 574416d24931e38fd160acc033a983cb36d27555..ca0505fdd1d28ceba02993a67c69baf05a2a51d5 100644 (file)
--- a/Home.md
+++ b/Home.md
@@ -43,7 +43,7 @@ The following modes are more popular ones:
 
 The following modes are available, although slightly less common than the above:
 
--   [Arena](Arena)
+-   [Arena](Arena) (removed)
 -   [Assault](Assault)
 -   [Conquest](Conquest)
 -   [Domination](Domination)
@@ -51,10 +51,9 @@ The following modes are available, although slightly less common than the above:
 -   [Nexball](Nexball)
 -   [Onslaught](Onslaught)
 -   [Race](Race)
--   [Runematch](Rune)
 
 #### Standard Mutators
-Mutators change the configuration of the game play, e.g. how weapon appears, which special weapons are availabale, or the physics in the game. This is usually set by the game admins who set up games for other players.  Standard Mutators are available in the game menu.
+Mutators change the configuration of the game play, e.g. how weapon appears, which special weapons are availabale, or the physics in the game. This is usually set by the game admins who set up games for other players. Standard Mutators are available in the game menu.
 
 -   [Dodging](Dodging)
 -   [Midair](Midair)
@@ -78,33 +77,14 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 #### [Mods](Mods)
 
 ### Misc
+-   [Autobuilds](Autobuilds)
+-   [Privacy and Security](privacy-and-security)
 -   [Handicap](handicap)
 -   [Camera for demos explained](Demo-Camera)
 -   [Xonotic Bot Orchestra](Xonotic-Bot-Orchestra)
 -   [Impulse map](impulse-map)
-
-
-## The Software
--   [Repository Access](Repository_Access) (how to compile from git) (see also [Git repo structure](Git))
--   [Autobuilds](Autobuilds)
--   [Privacy and Security](privacy-and-security)
 -   [Hardware Requirements](Hardware-Requirements)
 
-## Arts & Media
--   [Art Roadmap](Art-Roadmap)
--   [Artistic Style](Artistic-Style)
--   [Xonotic Logo](Logo)
--   [Maps Makeover](Maps-Makeover)
--   [Weapons Makeover](Weapons-Makeover)
-    -   [New weapon names discussion](NamesWeapons)
--   [2d art](2d art)
--   [Music](Music)
-    -   [Music contributions](Music-contributions)
--   [Sound FX](Sound-FX)
-    -   [Sound FX contributions](Sound-FX-contributions)
--   Story Themes
-    -   [Close to home](Close-to-home)
-    -   [Tech Conglomerate](Tech-Conglomerate)
 
 ## Server Administration
 ### Tutorials
@@ -122,9 +102,10 @@ Mutators change the configuration of the game play, e.g. how weapon appears, whi
 ### Troubleshooting
 -   [Performance](https://forums.xonotic.org/showthread.php?tid=7374&pid=80938#pid80938)
 
-## Contribute
 
-In this section you will find helpful information about development of the software Xonotic in general, let that be coding, texturing, modeling, mapping, etc
+## Development
+
+-   [Repository Access](Repository_Access) (how to compile from git) (see also [Git repo structure](Git))
 
 ### Programming
 -   [Introduction to QuakeC](Introduction-to-QuakeC)
@@ -163,6 +144,7 @@ In this section you will find helpful information about development of the softw
 -   [Mapper resources](Mapper-resources)
 -   [Map naming convention](http://alientrap.org/forum/viewtopic.php?f=2&t=2363&sid=4f8a9e06ada52255e98bdfa744ec6beb#p27330)
 
+
 ## Project
 
 ### Team, Community, and Public Relations
@@ -177,6 +159,23 @@ In this section you will find helpful information about development of the softw
 -   Notes from brainstorming [ideas for names](names)
 -   [Xonotic compatibility pack](Xonotic-compatibility-pack) a small pk3 that will rebrand a default Nexuiz install
 
+### Arts & Media
+-   [Art Roadmap](Art-Roadmap)
+-   [Artistic Style](Artistic-Style)
+-   [Xonotic Logo](Logo)
+-   [Maps Makeover](Maps-Makeover)
+-   [Weapons Makeover](Weapons-Makeover)
+    -   [New weapon names discussion](NamesWeapons)
+-   [2d art](2d art)
+-   [Music](Music)
+    -   [Music contributions](Music-contributions)
+-   [Sound FX](Sound-FX)
+    -   [Sound FX contributions](Sound-FX-contributions)
+-   Story Themes
+    -   [Close to home](Close-to-home)
+    -   [Tech Conglomerate](Tech-Conglomerate)
+
+
 ## Nexuiz-related
 
 ### General Info

diff --git a/Rune.md b/Rune.md
deleted file mode 100644 (file)
index aad7a1d..0000000
--- a/Rune.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Runematch
-=========
-
-Object of the Game
-------------------
-
-_(Insert objective of the game here)_
-
-Map Entities
-------------
-
-_(Insert Map Entities here)_
-
-Helpful Hints and Tips
-----------------------
-
--   _(Insert Hints Here)_
-
-List of Demos and Videos
-------------------------
-
--   Demo: _(Insert Demo or Video Here)_
--   Players: _(Insert Player Names Here)_
--   Key Points: _(Insert key points in match here)_
-