Merge branch 'master' into fix/strict_mkdocs

Author: InvoxiPlayGames

README.md

@@ -51,7 +51,9 @@ cd wiki/
 
 4. Choose one of the two deployment methods below.
 
-... DEPLOYMENT / STARTUP of mkdocs ...
+```sh
+pip install mkdocs mkdocs-material mkdocs-redirects
+```
 
 5. At this point, load up the cloned repository in a text editor that has live-markdown preview function.
   - For example: Visual Studio Code. Instructions: (https://code.visualstudio.com/Docs/languages/markdown)

docs/Development/LibXenon/index.md

@@ -32,8 +32,7 @@ already! - See bottom of [Xenon Toolchain](https://github.com/Free60Project/libx
 ## Support
 
 **libXenon** (or **devkitxenon**) stuff is best discussed in
-\#free60-noos on the OFTC IRC network , <irc://irc.oftc.net/free60-noos>
-or in \#libXenon on EFnet IRC, <irc://irc.efnet.fr/libXenon>
+the [IRC](/Support/IRC/) or [Discord](/Support/Discord/)
 
 ## Sample Code
 

docs/Hacks/NAND_Reading.md

@@ -15,8 +15,6 @@ There are guides to dump via USB, but compared to this it's quite
 expensive and easily found with a search. Maybe someone will add one
 later on.
 
-If you're facing any problems, feel free to ask in \#free60 on OFTC. :)
-
 Moreover thanks to tmbinc, Tiros, Redline and all else involved (feel
 free to add their names) for their great work! :)
 

docs/Support/Discord.md

@@ -0,0 +1,6 @@
+Join us in the Free60 Project Discord guild at
+[https://discord.gg/KvMB4HzHym](https://discord.gg/KvMB4HzHym)
+to discuss the Free60 project, the Linux kernel ports, LibXenon and LibXenon
+homebrew, and XeLL Reloaded.
+
+Rules are available in the \#rules-and-guidelines channel.

docs/Support/Help.md

@@ -1,13 +1,9 @@
-## IRC
+## IRC/Discord
 
-Server ⇒ <font color="purple">irc.oftc.net</font>(irc.oftc.net)
-Channel ⇒ \#free60 ; \#free60-chat ; \#free60-dev
-or if theres nobody replying try:
+For real-time chat, for either support or to help with the project, you can
+join us on [IRC](/Support/IRC/) or [Discord](/Support/Discord/).
 
-Server ⇒ <font color="purple">irc.efnet.nl</font>
-Channel ⇒ \#libxenon
-
-\== Want to Help? ==
+## Want to Help?
 
 Here is what you can do to help this project:
 

docs/Support/IRC.md

@@ -1,22 +1,22 @@
-Join us on the Free60 IRC channel at <irc://irc.oftc.net/free60-chat>
-(server irc.oftc.net, channel **\#free60-chat**)
+Join us in the Free60 IRC channel(s) **\#free60** at
+[irc.libera.chat](https://libera.chat/) to discuss the Free60 project, the
+Linux kernel ports, LibXenon and LibXenon homebrew, and XeLL Reloaded.
 
-To contribute new information and speak with devs, come to
-<irc://irc.oftc.net/free60> (server irc.oftc.net, channel **\#free60**)
+## Free60 Channel List
 
-There's also a channel for the guys on EFNET which is currently the most
-active channel of all three.
+* **\#free60** for general Free60 discussion.
+* **\#free60-libxenon** for LibXenon.
+* **\#free60-linux** for the Free60 Linux patches.
+* **\#free60-xell** for XeLL Reloaded.
 
-Catch us in **#libxenon** on EFnet!
+## Guidelines
 
-Free60 and oftc.net are happy to facilitate the means for information
+Free60 and Libera.Chat are happy to facilitate the means for information
 gathering and dissemination. But, we have some basic guidelines we need
 you to follow.
 
-## Guidelines
-
 We're not trying to be dictators, we just want everyone to get along.
-[OFTC](http://www.oftc.net/) is a civil network and we'd like to keep it
+[Libera](https://libera.chat/) is a civil network and we'd like to keep it
 that way.
 
 ### Basic Guidelines
@@ -35,20 +35,20 @@ that way.
 
   - Please don't run any bots without prior permission from an op.
 
-  - Channel opertator status is not a privilege, but rather a
+  - Channel operator status is not a privilege, but rather a
     responsibilty. Asking for such will more than likely get you banned.
 
   - \#free60 is NOT a distribution point for pirated/illegal material,
     be it software or even documentation. We have zero-tolerance towards
-    any related discussion. That also goes for use of !list or other
-    such commands. You have been warned.
+    any related discussion.
+  
+  - Messages sent in the IRC channels are forwarded to the Discord guild.
 
 ### Asking Questions
 
 #### Before Asking
 
-  - Search the wiki for an answer.
-  - Search the mailing list.
+  - Search the wiki and [GitHub](https://github.com/Free60Project) for an answer.
 
 #### While Asking
 
@@ -63,31 +63,7 @@ that way.
     post that info.
   - Stick around to help others after you.
 
-### Use the right channel
-
-There are two channels in OFTC currently for public use:
-
-1.  **#free60** is for technical and development discussion, for idle chat
-    seek #free60-chat.
-2.  **#free60-chat** is for general discussion on or off topic for free60
-    and is loosely controlled.
-
-And one public channel on EFNET
-
-1.  **#libxenon** for everything from LibXenon and Linux till XeLL
-
-  - Currently neither channel is moderated ( m) though if conversations
-    get out of hand or anything of that nature we reserve the right to
-    place higher restrictions.
-  - Both channels will receive the same updates about important
-    information.
-  - You can hang out in both, but make sure you questions are for the
-    right channel.
-
 ## Conclusion
 
 Thank you for your interest in Free60, enjoy your stay!
 
-<iframe src="https://webchat.oftc.net/?channels=%23free60%2C%23free60-chat" width="647" height="400"></iframe>
-
-

docs/System-Software/Formats/XEX.md

@@ -17,60 +17,60 @@ Actually it has been reported to work with the first official "Backward
 Compatibility" .XEX File from Microsoft. It takes the XEX file as
 argument.
 
-`// default.xex table dumper`
-` // only works with the default.xex from the xbox360 emulator update package.`
-` // - th0mas, th0mas.sixbit.org [at] gmail.com`
-` `
-` #include <stdio.h>`
-` #include <string.h>`
-` `
-` #define TABLE_START 0x288`
-` `
-` struct table {`
-`    unsigned int unknown[6];`
-` };`
-` `
-` unsigned int ByteSwap (unsigned int nInt)`
-` {`
-`    union u {unsigned int vi; unsigned char c[sizeof(unsigned int)];};`
-`    union v {unsigned int ni; unsigned char d[sizeof(unsigned int)];};`
-`    union u un;`
-`    union v vn;`
-`    un.vi = nInt;`
-`    vn.d[0]=un.c[3];`
-`    vn.d[1]=un.c[2];`
-`    vn.d[2]=un.c[1];`
-`    vn.d[3]=un.c[0];`
-`    return (vn.ni);`
-` }`
-` `
-` void printTable(struct table *t)`
-` {`
-`    int i;`
-`    for (i = 0; i < 6; i  ) {`
-`       int j = ByteSwap(t->unknown[i]);`
-`       printf("0x%08x ", j);`
-`    }`
-`    printf("\n");`
-` }`
-` `
-` int main(int argc, char **argv)`
-` {`
-`    FILE *fp = fopen(argv[1], "rb");`
-`    struct table tmp;`
-`    int numEntries = 0;`
-`    int i;`
-` `
-`    fseek(fp, TABLE_START, SEEK_SET);`
-`    fread(&numEntries, sizeof(unsigned int), 1, fp);`
-`    numEntries = ByteSwap(numEntries);`
-`    for (i = 0; i < numEntries; i  ) {`
-`         fread(&tmp, sizeof(struct table), 1, fp);`
-`         printTable(&tmp);`
-`    }`
-` }`
-` `
-` `
+```c
+// default.xex table dumper
+// only works with the default.xex from the xbox360 emulator update package.
+// - th0mas, [email protected]
+
+#include <stdio.h>
+#include <string.h>
+
+#define TABLE_START 0x288
+
+struct table {
+   unsigned int unknown[6];
+};
+
+unsigned int ByteSwap (unsigned int nInt)
+{
+   union u { unsigned int vi; unsigned char c[sizeof(unsigned int)]; };
+   union v { unsigned int ni; unsigned char d[sizeof(unsigned int)]; };
+   union u un;
+   union v vn;
+   un.vi = nInt;
+   vn.d[0]=un.c[3];
+   vn.d[1]=un.c[2];
+   vn.d[2]=un.c[1];
+   vn.d[3]=un.c[0];
+   return (vn.ni);`
+}
+
+void printTable(struct table *t)
+{
+   int i;
+   for (i = 0; i < 6; i++) {
+      int j = ByteSwap(t->unknown[i]);
+      printf("0x%08x ", j);
+   }
+   printf("\n");
+}
+
+int main(int argc, char **argv)
+{
+   FILE *fp = fopen(argv[1], "rb");
+   struct table tmp;
+   int numEntries = 0;
+   int i;
+
+   fseek(fp, TABLE_START, SEEK_SET);
+   fread(&numEntries, sizeof(unsigned int), 1, fp);
+   numEntries = ByteSwap(numEntries);
+   for (i = 0; i < numEntries; i++) {
+        fread(&tmp, sizeof(struct table), 1, fp);
+        printTable(&tmp);
+   }
+}
+```
 
 # Structure of the XEX File
 

docs/index.md

@@ -3,10 +3,15 @@
 Welcome to the archive of Free60.org Mediawiki.
 
 To submit changes:
-1. Fork the repo
+
+1. Fork [the repo](https://github.com/Free60Project/wiki)
+
 2. Make changes
+
 3. Send a Pull Request
 
+Join us on [IRC](/Support/IRC/) or [Discord](/Support/Discord/)!
+
 ## Categories
 
 [Xbox 360 Hardware](./Hardware/index.md)

mkdocs.yml

@@ -45,11 +45,11 @@ validation:
 nav:
     - Home:
       - 'index.md'
-      - Attack: 'Support/Attack.md'
+      - IRC: 'Support/IRC.md'
+      - Discord: 'Support/Discord.md'
       - Contribute: 'Support/Contribute.md'
       - Help: 'Support/Help.md'
       - Frequently Asked Questions: 'Support/FAQ.md'
-      - IRC: 'Support/IRC.md'
       - Links: 'Support/Links.md'
     - Hacks:
       - Reset Glitch Hack (RGH): 'Hacks/Reset_Glitch_Hack.md'