From 723b1eb479030dd92fe6bc97aca76868f3ea9012 Mon Sep 17 00:00:00 2001
From: TechEmporium <techemporium@noreply.tildegit.org>
Date: Sun, 30 Jun 2019 00:14:36 -0400
Subject: [PATCH 01/14] Fixed even more HTML code

---
 wiki.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/wiki.php b/wiki.php
index 278256e..27685b3 100644
--- a/wiki.php
+++ b/wiki.php
@@ -16,12 +16,12 @@ print "<!DOCTYPE html>
 echo ( shell_exec("/usr/bin/pandoc includes/header.md") );
 
 print "<hr/>
-	<div id='content' style='width=90%'>
-		<div id='sidebar' style='20%'>";
+	<div id='content' style='width: 90%;'>
+		<div id='sidebar' style='width: 20%;'>";
 echo ( shell_exec("/usr/bin/pandoc includes/sidebar.md") );
 
 print "	</div>
-	<div='content' style='width=80%'>";
+	<div id='content' style='width: 80%;'>";
 
 echo ( shell_exec("/usr/bin/pandoc articles/$page.md") );
 

From a7f83b9d7b8bf122661ad7da5b687c83c2057467 Mon Sep 17 00:00:00 2001
From: TechEmporium <techemporium@noreply.tildegit.org>
Date: Sun, 30 Jun 2019 00:15:38 -0400
Subject: [PATCH 02/14] Fixed more of your HTML

---
 wiki.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki.php b/wiki.php
index 27685b3..e82b6c6 100644
--- a/wiki.php
+++ b/wiki.php
@@ -7,7 +7,7 @@ if ( $page == "") {
 	}
 
 print "<!DOCTYPE html>
-<html lang='e'>
+<html lang='en'>
 	<head>
 		<title>Thunix Wiki - $page</title>
 		<link rel='stylesheet' type='text/css' href='includes/site.css'>

From f0a7a3dce025468c78304308c16f6fd84d8e8379 Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 00:54:18 -0400
Subject: [PATCH 03/14] v002_01: [Draft U2D]

Brought Drafts up-2-date on the bitb repo.
---
 articles/README.md                     |   9 +
 articles/wiki/unsorted/ansible.md      |  74 ++++++++
 articles/wiki/unsorted/chat.md         |  47 ++++++
 articles/wiki/unsorted/contributing.md |   3 +
 articles/wiki/unsorted/email.md        |   9 +
 articles/wiki/unsorted/sandbox.md      |   2 +
 articles/wiki/unsorted/ssh.md          |   5 +
 articles/wiki/unsorted/thunix.md       | 224 +++++++++++++++++++++++++
 articles/wiki/unsorted/tildegit.org.md |  61 +++++++
 9 files changed, 434 insertions(+)
 create mode 100644 articles/README.md
 create mode 100644 articles/wiki/unsorted/ansible.md
 create mode 100644 articles/wiki/unsorted/chat.md
 create mode 100644 articles/wiki/unsorted/contributing.md
 create mode 100644 articles/wiki/unsorted/email.md
 create mode 100644 articles/wiki/unsorted/sandbox.md
 create mode 100644 articles/wiki/unsorted/ssh.md
 create mode 100644 articles/wiki/unsorted/thunix.md
 create mode 100644 articles/wiki/unsorted/tildegit.org.md

diff --git a/articles/README.md b/articles/README.md
new file mode 100644
index 0000000..06a6f72
--- /dev/null
+++ b/articles/README.md
@@ -0,0 +1,9 @@
+<center><h1>Official Thunix Wiki.</h1></center>       <!-- Make Image?-->
+<!-- Buttons Here... -->
+#### Welcome to the Offical Thunix Wiki!
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;test
+
+test
+
+adding some test
diff --git a/articles/wiki/unsorted/ansible.md b/articles/wiki/unsorted/ansible.md
new file mode 100644
index 0000000..69ac1a8
--- /dev/null
+++ b/articles/wiki/unsorted/ansible.md
@@ -0,0 +1,74 @@
+man {#man align="center"}
+===
+
+[NAME](#NAME)\
+[SYNOPSIS](#SYNOPSIS)\
+[DESCRIPTION](#DESCRIPTION)\
+[SEE ALSO](#SEE%20ALSO)\
+[BUGS](#BUGS)\
+[AUTHOR](#AUTHOR)\
+
+------------------------------------------------------------------------
+
+NAME []()
+---------
+
+Ansible on Thunix - how we manage the server
+
+SYNOPSIS []()
+-------------
+
+ansible-pull
+
+DESCRIPTION []()
+----------------
+
+We use ansible to manage the servers running the systems and services
+for Thunix. Ansible consists of a "playbook" of YAML files, that declare
+the state of the system.
+
+The first step is to clone the repo used to manage the environment:
+
+git clone git@ttm.sh:thunix/ansible.git (You will need a tidegit account
+for this, and a key loaded into your account there)
+
+From there, the typical github-type workflow is used:
+
+\* Create a local branch, to track your issue’s changes.
+
+\* Commit changes to your local branch.
+
+\* Send a URI pointing to your repo, with branch name to someone with
+merge permissions
+
+Inside of the tildegit interface:
+
+\* Create a new branch, selecting option to create a branch and pull
+request
+
+\* Make changes in your branch
+
+\* Update PR
+
+\* Wait for someone to merge your changes
+
+Hourly, a job runs that pulls the latest version of the repo, and the
+runs ansible-playbook against the playbook. A sudoer can manually run
+this job, if desired, and it’s located at /etc/cron.hourly/ansible-pull.
+
+SEE ALSO []()
+-------------
+
+tildegit.org(8), git(8), ansible-playbook(8)
+
+BUGS []()
+---------
+
+No known bugs.
+
+AUTHOR []()
+-----------
+
+Uber Geek (ubergeek@thunix.net)
+
+------------------------------------------------------------------------
diff --git a/articles/wiki/unsorted/chat.md b/articles/wiki/unsorted/chat.md
new file mode 100644
index 0000000..485fde0
--- /dev/null
+++ b/articles/wiki/unsorted/chat.md
@@ -0,0 +1,47 @@
+man {#man align="center"}
+===
+
+[NAME](#NAME)\
+[SYNOPSIS](#SYNOPSIS)\
+[DESCRIPTION](#DESCRIPTION)\
+[BUGS](#BUGS)\
+[SEE ALSO](#SEE%20ALSO)\
+[AUTHOR](#AUTHOR)\
+
+------------------------------------------------------------------------
+
+NAME []()
+---------
+
+chat - chat script
+
+SYNOPSIS []()
+-------------
+
+chat
+
+DESCRIPTION []()
+----------------
+
+This is a simple script to launch weechat for new users, and get them
+into the correct channel for chat and support.
+
+BUGS []()
+---------
+
+\* If you have a customized list of servers in your weechat config
+already, this may try to connect you twice, and you’ll have two nicks
+going at once, which will be confusing. Once you’ve customized weechat
+to your liking, just invoke ’weechat’ or ’weechat-curses’.
+
+SEE ALSO []()
+-------------
+
+weechat(8)
+
+AUTHOR []()
+-----------
+
+Uber Geek (ubergeek@thunix.net)
+
+------------------------------------------------------------------------
diff --git a/articles/wiki/unsorted/contributing.md b/articles/wiki/unsorted/contributing.md
new file mode 100644
index 0000000..d422a70
--- /dev/null
+++ b/articles/wiki/unsorted/contributing.md
@@ -0,0 +1,3 @@
+## Contributing to the wiki
+
+Just do a PR on [tildegit](https://tildegit.org/thunix/wiki)
diff --git a/articles/wiki/unsorted/email.md b/articles/wiki/unsorted/email.md
new file mode 100644
index 0000000..12f16f6
--- /dev/null
+++ b/articles/wiki/unsorted/email.md
@@ -0,0 +1,9 @@
+## Your Thunix Email
+
+Every thunix account comes with a functional and encrypted email address. This email is the same as your SSH login name. However, you will need to set a password on your thunix SSH account, using the PASSWD command in BASH. Though your SSH account will have a password, this will NOT affect how you log into your account using SSH or an SFTP client, as your public/private key pair will always work. The account password, however, will affect your thunix email address.
+
+Your email can be accessed in one of three ways:
+
+1. Running the Mutt email client through your SSH account
+2. Logging into your email account from our [web mail](https://www.thunix.net/webmail/) service
+3. Through an email client program installed on your computer, using IMAP
\ No newline at end of file
diff --git a/articles/wiki/unsorted/sandbox.md b/articles/wiki/unsorted/sandbox.md
new file mode 100644
index 0000000..4492017
--- /dev/null
+++ b/articles/wiki/unsorted/sandbox.md
@@ -0,0 +1,2 @@
+## Sandbox
+Just a sandbox
diff --git a/articles/wiki/unsorted/ssh.md b/articles/wiki/unsorted/ssh.md
new file mode 100644
index 0000000..2b4f8b4
--- /dev/null
+++ b/articles/wiki/unsorted/ssh.md
@@ -0,0 +1,5 @@
+## SSH and Thunix (And magic!) 
+
+When you [sign up](https://www.thunix.net/signup.php) for an account on thunix, you'll be given remote access to a Linux shell server, with web hosting, gopher hosting and email. And because of our [GDPR and privacy policy](https://www.thunix.net/gdpr.php), we take security seriously. This is why we use SSH key pairs to grant access to our server through SSH or SFTP.
+
+On our signup page, you'll seen an entry for a "Public SSH Key." SSH key pairs work on the basis of having two files; one is a public key that you can send to us when we create your account, while the other is a private key that you keep on your computer, away from public knowledge.
\ No newline at end of file
diff --git a/articles/wiki/unsorted/thunix.md b/articles/wiki/unsorted/thunix.md
new file mode 100644
index 0000000..caf9ed1
--- /dev/null
+++ b/articles/wiki/unsorted/thunix.md
@@ -0,0 +1,224 @@
+man {#man align="center"}
+===
+
+[NAME](#NAME)\
+[SYNOPSIS](#SYNOPSIS)\
+[ADMINISTRATORS](#ADMINISTRATORS)\
+[DESCRIPTION](#DESCRIPTION)\
+[Purpose](#Purpose)\
+[Terms of Service](#Terms%20of%20Service)\
+[Architecture](#Architecture)\
+[SEE ALSO](#SEE%20ALSO)\
+[AUTHOR](#AUTHOR)\
+
+------------------------------------------------------------------------
+
+NAME []()
+---------
+
+Thunix - a public Linux server
+
+SYNOPSIS []()
+-------------
+
+ssh thunix.net
+
+ADMINISTRATORS []()
+-------------------
+
+List of system adminstrators are:
+
+\* amcclure - Email: amcclure@thunix.net\
+IRC: amcclure/irc.tilde.chat, amcclure/irc.freenode.net
+
+\* naglfar - Email: naglfar@thunix.net\
+IRC: Naglfar/irc.tilde.chat, Naglfar/irc.freenode.net
+
+\* ubergeek - Email: ubergeek@thunix.net, ubergeek@yourtilde.com\
+- IRC: ubergeek/irc.tilde.chat, ub3g33k/irc.freenode.net
+
+\* fosslinux - Email: fosslinux@thunix.net\
+- IRC: fosslinux/irc.tilde.chat
+
+DESCRIPTION []()
+----------------
+
+Thunix is a publicly accesible Linux server, running Debian 9, and
+managed using ansible playbooks.
+
+There are many optional things to do on Thunix. There is IRC chat
+availble with the weechat client. Most build tools are available to you
+as well, to include git, make, gcc, go, python, and perl. Mail facilties
+are also available for you to use via alpine, mutt, or even mailx.
+
+To enter chat, just type ’chat’ and hit enter. You’ll be dropped into
+the \#thunix chat room on the irc.tilde.chat network.
+
+You should create an account at tildegit.org, where Thunix’s git repos
+are hosted, to include the system configuration definition files.
+
+Ansible is the tool we use to configure the systems that comprise
+Thunix. Git and ansible are two tools your should familiarize yourself
+with.
+
+Purpose []()
+------------
+
+The goal of Thunix is to be an open and collaborative environment,
+conducive to learning the principles of \*Nix operating systems,
+regarding how they work, how to administer them, how to use them, and
+how to collaborate using them.
+
+Thunix tries to adhere to the values and philosophy of the Hacker Ethic
+whenever possible. The hacker ethics and beliefs as described by Levy
+are:
+
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* Access to computers - |
+|                          |                          | and anything which might |
+|                          |                          | teach you something      |
+|                          |                          | about the way the world  |
+|                          |                          | works - should be        |
+|                          |                          | unlimited and total.     |
+|                          |                          | Always yield to the      |
+|                          |                          | Hands-On Imperative!     |
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* All information       |
+|                          |                          | should be free           |
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* Mistrust authority -  |
+|                          |                          | promote decentralization |
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* Hackers should be     |
+|                          |                          | judged by their hacking, |
+|                          |                          | not criteria such as     |
+|                          |                          | degrees, age, race, sex, |
+|                          |                          | or position              |
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* You can create art    |
+|                          |                          | and beauty on a computer |
++--------------------------+--------------------------+--------------------------+
+|                          |                          | \* Computers can change  |
+|                          |                          | your life for the better |
++--------------------------+--------------------------+--------------------------+
+
+Thunix will never use proprietary software but users can do that if they
+wish. This is something they should avoid however.
+
+Terms of Service []()
+---------------------
+
+Nothing is without its rules and regulations; thunix is no exception.
+Below are the site’s service terms. Everything in this page should be
+clear to everyone who wishes to use thunix’s services; failure to abide
+by these terms can result in penalties such as service bans and may
+result in legal action against any offending users, depending on the
+severity of each case and any other individuals who may have been
+affected. Thunix may conduct investigations on any suspected violations,
+and we will cooperate with law enforcement agencies with their
+investigations. Be sure to read this page carefully and understand it.
+
+You are responsibe for checking your local mail account from time to
+time. This email address is the only one we retain, and as such, any
+warnings and notices regarding your account, or service status will be
+sent to this account.
+
++--------------------------------------+--------------------------------------+
+|                                      | \* Deliberately defacing the         |
+|                                      | accounts of other users              |
++--------------------------------------+--------------------------------------+
+|                                      | \* Deliberately trying to disrupt    |
+|                                      | thunix’s server                      |
++--------------------------------------+--------------------------------------+
+|                                      | \* Using thunix as a launch pad for  |
+|                                      | disrupting other servers             |
++--------------------------------------+--------------------------------------+
+|                                      | \* Using thunix to impersonate other |
+|                                      | websites and businesses for criminal |
+|                                      | purposes                             |
++--------------------------------------+--------------------------------------+
+|                                      | \* Storing/distributing pornography  |
+|                                      | of any genre and medium (especially  |
+|                                      | child pornography)                   |
++--------------------------------------+--------------------------------------+
+|                                      | \* Storing/distributing content that |
+|                                      | defames any individual               |
++--------------------------------------+--------------------------------------+
+|                                      | \* Promoting racial, ethnic,         |
+|                                      | religious, political and other forms |
+|                                      | of bigotry                           |
++--------------------------------------+--------------------------------------+
+|                                      | \* Storing/distributing, promoting,  |
+|                                      | or encouraging use of                |
+|                                      | pirated/cracked software, license    |
+|                                      | keys, license/registration           |
+|                                      | circumvention programs, or any       |
+|                                      | questionable programs/scripts that   |
+|                                      | can risk causing unauthorized        |
+|                                      | modifications, or disrupts network   |
+|                                      | services for any programs or         |
+|                                      | devices.                             |
++--------------------------------------+--------------------------------------+
+|                                      | \* Mining cryptocurrencies           |
++--------------------------------------+--------------------------------------+
+|                                      | \* Spamming on any forums, mailing   |
+|                                      | lists, irc channels, newsgroups,     |
+|                                      | etc.                                 |
++--------------------------------------+--------------------------------------+
+|                                      | \* Leaking or publishing any user’s  |
+|                                      | or individual’s personal information |
+|                                      | without that person’s consent.       |
++--------------------------------------+--------------------------------------+
+
+Copyright infringement is not allowed on thunix, and we will not allow
+any illegal content to be distributed. It’s also expected that all users
+respect the copyrights of those who produce original content of any kind
+and only share if the author or license grants you permission. Content
+hosted on accounts used for external file storage must also follow
+copyright law.
+
+If you want to request for content you own the copyright for to be
+removed from thunix, please refer to our abuse reporting page
+(https://www.thunix.net/abuse.php). In the email, please identify who
+you are, if you are the copyright holder or legally representing them,
+the exact files you want removed with links to the files and infringed
+content, and contact information such as phone numbers or a reply-to
+email address.
+
+Users that repeatedly violate the Terms of Service will have their
+account removed. Depending on the degree of the offense, their account
+may be removed immediately. These terms also apply to communication
+services such as forums, mailing lists, irc channels, newsgroups, and
+any other service either hosted on or used for thunix. If you come
+across anything that violates the terms of service, please let us know
+with the abuse reporting page (https://www.thunix.net/abuse.php).
+
+Architecture []()
+-----------------
+
+The Thunix system consists of one server, running Debian 9, which runs
+inside of an LXD container. This allows for an out-of-band
+administration of the host, in case of configuration-gone-awry.
+
+Hourly, thunix reaches out to tildegit, pull down the latest version of
+the configuration, and run the configuration tool, ensuring it is in a
+known, and easily replicable state.
+
+All repos for system configuration, Thunix-supplied/ran code is hosted
+on tildegit.org. Thunix users are recommended to create accounts on
+tildegit, and contribute pull requests to make their desired changes to
+the system, or very minimally, submit issues for problems and/or
+requests.
+
+SEE ALSO []()
+-------------
+
+ssh(8), weechat(8), git(8), make(8), gcc(8), go(8), python(8), perl(8),
+alpine(8), mutt(8), mailx(8), ansible-playbook(8), tildegit.org(8)
+
+AUTHOR []()
+-----------
+
+Uber Geek (ubergeek@thunix.net) amcclure (amcclure@thunix.net)
+
+------------------------------------------------------------------------
diff --git a/articles/wiki/unsorted/tildegit.org.md b/articles/wiki/unsorted/tildegit.org.md
new file mode 100644
index 0000000..d707b38
--- /dev/null
+++ b/articles/wiki/unsorted/tildegit.org.md
@@ -0,0 +1,61 @@
+man {#man align="center"}
+===
+
+[NAME](#NAME)\
+[SYNOPSIS](#SYNOPSIS)\
+[DESCRIPTION](#DESCRIPTION)\
+[SEE ALSO](#SEE%20ALSO)\
+[BUGS](#BUGS)\
+[AUTHOR](#AUTHOR)\
+
+------------------------------------------------------------------------
+
+NAME []()
+---------
+
+tildegit.org - a public web based source repository for the tildeverse
+
+SYNOPSIS []()
+-------------
+
+https://tildegit.org
+
+DESCRIPTION []()
+----------------
+
+Tildegit is a web based source control system available for the
+tildeverse, that runs gitea. Thunix uses tildegit.org for all source
+control.
+
+The following git repos are used:
+
+\* ansible (https://tildegit.org/thunix/ansible) This repo stores the
+configuration spec for all machines comprising Thunix. The repo consists
+of declarative YAML files that describes the state the machines should
+be in.
+
+\* www (https://tildegit.org/thunix/www) This repo stores the source
+code that makes up the https:/thunix.net website. It’s mostly php.
+
+\* documentation (https://tildegit.org/thunix/documentation) This repo
+stores the man pages, and accompanying documentation for the system.
+
+\* thunix\_gopher (https://tildegit.org/thunix/thunix\_gopher) This repo
+houses our gopher hole
+
+SEE ALSO []()
+-------------
+
+git(8), ansible(8)
+
+BUGS []()
+---------
+
+No known bugs.
+
+AUTHOR []()
+-----------
+
+Uber Geek (ubergeek@thunix.net)
+
+------------------------------------------------------------------------

From cdc4d00d00d956cb07aa391b4372aac2b4c227dc Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 01:36:21 -0400
Subject: [PATCH 04/14] v002-2: [Welcome Page Updates]

Updated the wiki welcome page (main.md) to make it more proper.

Fixed accidental modification of readme.md in the repository root.
---
 articles/README.md           |  9 ---------
 articles/main.md             | 22 ++++++++++++++++------
 articles/main.md.depreciated |  8 ++++++++
 3 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 100644 articles/README.md
 create mode 100644 articles/main.md.depreciated

diff --git a/articles/README.md b/articles/README.md
deleted file mode 100644
index 06a6f72..0000000
--- a/articles/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<center><h1>Official Thunix Wiki.</h1></center>       <!-- Make Image?-->
-<!-- Buttons Here... -->
-#### Welcome to the Offical Thunix Wiki!
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;test
-
-test
-
-adding some test
diff --git a/articles/main.md b/articles/main.md
index 4f21c26..37eb16f 100644
--- a/articles/main.md
+++ b/articles/main.md
@@ -1,8 +1,18 @@
-## Main Page
+<!--<center><h1>Official Thunix Wiki.</h1></center>   ~Need to Return to this at some point.-->
+<!-- Buttons Here... -->
+#### Welcome to the Offical Thunix Wiki!
 
-* [SSH and keys](ssh)
-* [Email](email)
-* [Sandbox Page](sandbox)
-
-* [Contributing to this wiki](contributing)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Hello, and welcome to the Official Thunix wiki!
+This is a multi-contributor project created to give useful guides & documentation on common and uncommon topics alike. Most of things in here will pertain directly to **Thunix**, which is the platform you are (or if not, _should be_) using.
+If you have any questions about the project, feel free to Direct Message ``xdovahkinx`` on IRC, or any of the other contributors/staff @ ``#thunix``.
+From all the contributors and staff at **Thunix**, we hope you enjoy the project and find it helpful and informative!
+***
+### To the [Table of Contents](tableofcontents)
+***
+Further notes;
 
+  - This project is maintained at the leisure of it's contributors. You might find out-of-date info or content. Each contributor is only responsible for their commits, and the topics they contribute.
+  - These guides, while upheld to a professional-like standard, may contain offensive language. If you are easily offended, take caution.
+  - There is usually more than one way to do the same job. You will most likely find pages with alternate methods that have been added by other contributors.
+  - Some guides may contain "Hacky" or non-recommended methods of completing certain tasks. These methods can sometimes carry some risks. You, as an individual are SOLELY RESPONSIBLE for any and all actions you take as a result of reading ANY of the content in this wiki. We will always try to provide the safest methods or guides, but we cannot fix stupid. Be careful and vigilant.
+  - Again, this is maintained by contributors, NOT Thunix Staff. Any content created herein are at the responsibility of the respective contributor(s). Thunix Staff are not liable/responsible for anything you do as a result of this wiki. Do NOT harass them with issues regarding the wiki or etc.
diff --git a/articles/main.md.depreciated b/articles/main.md.depreciated
new file mode 100644
index 0000000..4f21c26
--- /dev/null
+++ b/articles/main.md.depreciated
@@ -0,0 +1,8 @@
+## Main Page
+
+* [SSH and keys](ssh)
+* [Email](email)
+* [Sandbox Page](sandbox)
+
+* [Contributing to this wiki](contributing)
+

From 35128c83ff64603cbed50a6acbd313f4144d0c84 Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 01:46:58 -0400
Subject: [PATCH 05/14] v002_03: [hotfix]

Yet again attempting to fix the stupid readme in the root of the repository that is honestly not needed... we could always add it to an article later...
---
 README.md => README.md.2 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md => README.md.2 (100%)

diff --git a/README.md b/README.md.2
similarity index 100%
rename from README.md
rename to README.md.2

From 07bd9ca4eb63d1f6c3c4121f043457cef3e9c35f Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 01:58:20 -0400
Subject: [PATCH 06/14] x001: [Quick-Fix]

Continuing a quick fix, fixing missing file error.
---
 readme.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 readme.md

diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..7350ae0
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,11 @@
+<center><h1>Official Thunix Wiki.</h1></center>       <!-- Make Image?-->
+<!-- Buttons Here... -->
+
+---
+#### Welcome to the Offical Thunix Wiki!
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;test
+
+test
+
+adding some test

From 308311f2a2d00ec4c262c9ba2b06fb4da3fe9552 Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 02:07:20 -0400
Subject: [PATCH 07/14] v003_01: [Phase out older Readme]

Removed an old file.
---
 readme.md | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 readme.md

diff --git a/readme.md b/readme.md
deleted file mode 100644
index 7350ae0..0000000
--- a/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<center><h1>Official Thunix Wiki.</h1></center>       <!-- Make Image?-->
-<!-- Buttons Here... -->
-
----
-#### Welcome to the Offical Thunix Wiki!
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;test
-
-test
-
-adding some test

From 1bdc1bec1558575af88901be126c7a046b4352a2 Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 02:09:43 -0400
Subject: [PATCH 08/14] v003_02: [Phase in new readme]

... And replace it immediately for a pointless file... Which we will probably remove anyways... At least if I have anything to say about it...
---
 README.md.2 => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md.2 => README.md (100%)

diff --git a/README.md.2 b/README.md
similarity index 100%
rename from README.md.2
rename to README.md

From bea37fa3fc188665897dd6f370a0ee4fb0f8835e Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 02:11:39 -0400
Subject: [PATCH 09/14] v003_03: [More Trash Removal]

Misplaced files being removed...
---
 articles/main.md.depreciated | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 articles/main.md.depreciated

diff --git a/articles/main.md.depreciated b/articles/main.md.depreciated
deleted file mode 100644
index 4f21c26..0000000
--- a/articles/main.md.depreciated
+++ /dev/null
@@ -1,8 +0,0 @@
-## Main Page
-
-* [SSH and keys](ssh)
-* [Email](email)
-* [Sandbox Page](sandbox)
-
-* [Contributing to this wiki](contributing)
-

From d0db7c59aabfcc2691364bf2207c3663c49fb15c Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 02:21:02 -0400
Subject: [PATCH 10/14] v003_04: [Proofread/Additionals]

Proofread the ./articles/main.md file

Also added some sorting to the "Unsorted" directory; giving users individual folders for unsorted works by them/in progress works.
---
 articles/main.md                                          | 6 +++---
 articles/wiki/unsorted/{ => TechEmporium}/ansible.md      | 0
 articles/wiki/unsorted/{ => TechEmporium}/chat.md         | 0
 articles/wiki/unsorted/{ => TechEmporium}/contributing.md | 0
 articles/wiki/unsorted/{ => TechEmporium}/email.md        | 0
 articles/wiki/unsorted/{ => TechEmporium}/sandbox.md      | 0
 articles/wiki/unsorted/{ => TechEmporium}/ssh.md          | 0
 articles/wiki/unsorted/{ => TechEmporium}/thunix.md       | 0
 articles/wiki/unsorted/{ => TechEmporium}/tildegit.org.md | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename articles/wiki/unsorted/{ => TechEmporium}/ansible.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/chat.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/contributing.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/email.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/sandbox.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/ssh.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/thunix.md (100%)
 rename articles/wiki/unsorted/{ => TechEmporium}/tildegit.org.md (100%)

diff --git a/articles/main.md b/articles/main.md
index 37eb16f..350aec0 100644
--- a/articles/main.md
+++ b/articles/main.md
@@ -3,7 +3,7 @@
 #### Welcome to the Offical Thunix Wiki!
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Hello, and welcome to the Official Thunix wiki!
-This is a multi-contributor project created to give useful guides & documentation on common and uncommon topics alike. Most of things in here will pertain directly to **Thunix**, which is the platform you are (or if not, _should be_) using.
+This is a multi-contributor project created to give useful guides & documentation on common and uncommon topics alike. Most of the things in here will pertain directly to **Thunix**, which is the platform you are (or if not, _should be_) using.
 If you have any questions about the project, feel free to Direct Message ``xdovahkinx`` on IRC, or any of the other contributors/staff @ ``#thunix``.
 From all the contributors and staff at **Thunix**, we hope you enjoy the project and find it helpful and informative!
 ***
@@ -11,8 +11,8 @@ From all the contributors and staff at **Thunix**, we hope you enjoy the project
 ***
 Further notes;
 
-  - This project is maintained at the leisure of it's contributors. You might find out-of-date info or content. Each contributor is only responsible for their commits, and the topics they contribute.
+  - This project is maintained at the leisure of its contributors. You might find out-of-date info or content. Each contributor is only responsible for their commits, and the topics they contribute.
   - These guides, while upheld to a professional-like standard, may contain offensive language. If you are easily offended, take caution.
-  - There is usually more than one way to do the same job. You will most likely find pages with alternate methods that have been added by other contributors.
+  - There is usually more than one way to do the same job. You will most likely find pages with alternative methods that have been added by other contributors.
   - Some guides may contain "Hacky" or non-recommended methods of completing certain tasks. These methods can sometimes carry some risks. You, as an individual are SOLELY RESPONSIBLE for any and all actions you take as a result of reading ANY of the content in this wiki. We will always try to provide the safest methods or guides, but we cannot fix stupid. Be careful and vigilant.
   - Again, this is maintained by contributors, NOT Thunix Staff. Any content created herein are at the responsibility of the respective contributor(s). Thunix Staff are not liable/responsible for anything you do as a result of this wiki. Do NOT harass them with issues regarding the wiki or etc.
diff --git a/articles/wiki/unsorted/ansible.md b/articles/wiki/unsorted/TechEmporium/ansible.md
similarity index 100%
rename from articles/wiki/unsorted/ansible.md
rename to articles/wiki/unsorted/TechEmporium/ansible.md
diff --git a/articles/wiki/unsorted/chat.md b/articles/wiki/unsorted/TechEmporium/chat.md
similarity index 100%
rename from articles/wiki/unsorted/chat.md
rename to articles/wiki/unsorted/TechEmporium/chat.md
diff --git a/articles/wiki/unsorted/contributing.md b/articles/wiki/unsorted/TechEmporium/contributing.md
similarity index 100%
rename from articles/wiki/unsorted/contributing.md
rename to articles/wiki/unsorted/TechEmporium/contributing.md
diff --git a/articles/wiki/unsorted/email.md b/articles/wiki/unsorted/TechEmporium/email.md
similarity index 100%
rename from articles/wiki/unsorted/email.md
rename to articles/wiki/unsorted/TechEmporium/email.md
diff --git a/articles/wiki/unsorted/sandbox.md b/articles/wiki/unsorted/TechEmporium/sandbox.md
similarity index 100%
rename from articles/wiki/unsorted/sandbox.md
rename to articles/wiki/unsorted/TechEmporium/sandbox.md
diff --git a/articles/wiki/unsorted/ssh.md b/articles/wiki/unsorted/TechEmporium/ssh.md
similarity index 100%
rename from articles/wiki/unsorted/ssh.md
rename to articles/wiki/unsorted/TechEmporium/ssh.md
diff --git a/articles/wiki/unsorted/thunix.md b/articles/wiki/unsorted/TechEmporium/thunix.md
similarity index 100%
rename from articles/wiki/unsorted/thunix.md
rename to articles/wiki/unsorted/TechEmporium/thunix.md
diff --git a/articles/wiki/unsorted/tildegit.org.md b/articles/wiki/unsorted/TechEmporium/tildegit.org.md
similarity index 100%
rename from articles/wiki/unsorted/tildegit.org.md
rename to articles/wiki/unsorted/TechEmporium/tildegit.org.md

From 0203ad34fdeba5981bb0f6cec78da10c667999bf Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 03:11:43 -0400
Subject: [PATCH 11/14] Fuck this file.

This file has destroyed perfectly good PRs and is evil. I condemn it's soul to the deepest level of hell.

I will be adding a whole topic to the wiki (soonTM) regarding how to contribute to the wiki. This file is just in the way for now...
---
 README.md | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 6730f31..0000000
--- a/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Thunix Wiki
-
-Editing the wiki documents is easy.  They are all stored in ./articles, and are all markdown format.
-
-If you're feeling froggy, you can also do PR's for the code running the wiki, style sheets, etc etc.
-
-Support files (Header, footer, site.css) are in ./includes.
-
-So, to update the wiki, just submit a PR for it :)

From eeb230f0c7790ad123bcf156339f573c7e783217 Mon Sep 17 00:00:00 2001
From: dovahkin <x4g0tt3nSou1x@gmail.com>
Date: Sun, 30 Jun 2019 07:10:08 -0400
Subject: [PATCH 12/14] x004: [Removing Duped files]

---
 articles/ansible.md      |  74 -------------
 articles/chat.md         |  47 --------
 articles/contributing.md |   3 -
 articles/email.md        |   9 --
 articles/sandbox.md      |   2 -
 articles/ssh.md          |   5 -
 articles/thunix.md       | 224 ---------------------------------------
 articles/tildegit.org.md |  61 -----------
 8 files changed, 425 deletions(-)
 delete mode 100644 articles/ansible.md
 delete mode 100644 articles/chat.md
 delete mode 100644 articles/contributing.md
 delete mode 100644 articles/email.md
 delete mode 100644 articles/sandbox.md
 delete mode 100644 articles/ssh.md
 delete mode 100644 articles/thunix.md
 delete mode 100644 articles/tildegit.org.md

diff --git a/articles/ansible.md b/articles/ansible.md
deleted file mode 100644
index 69ac1a8..0000000
--- a/articles/ansible.md
+++ /dev/null
@@ -1,74 +0,0 @@
-man {#man align="center"}
-===
-
-[NAME](#NAME)\
-[SYNOPSIS](#SYNOPSIS)\
-[DESCRIPTION](#DESCRIPTION)\
-[SEE ALSO](#SEE%20ALSO)\
-[BUGS](#BUGS)\
-[AUTHOR](#AUTHOR)\
-
-------------------------------------------------------------------------
-
-NAME []()
----------
-
-Ansible on Thunix - how we manage the server
-
-SYNOPSIS []()
--------------
-
-ansible-pull
-
-DESCRIPTION []()
-----------------
-
-We use ansible to manage the servers running the systems and services
-for Thunix. Ansible consists of a "playbook" of YAML files, that declare
-the state of the system.
-
-The first step is to clone the repo used to manage the environment:
-
-git clone git@ttm.sh:thunix/ansible.git (You will need a tidegit account
-for this, and a key loaded into your account there)
-
-From there, the typical github-type workflow is used:
-
-\* Create a local branch, to track your issue’s changes.
-
-\* Commit changes to your local branch.
-
-\* Send a URI pointing to your repo, with branch name to someone with
-merge permissions
-
-Inside of the tildegit interface:
-
-\* Create a new branch, selecting option to create a branch and pull
-request
-
-\* Make changes in your branch
-
-\* Update PR
-
-\* Wait for someone to merge your changes
-
-Hourly, a job runs that pulls the latest version of the repo, and the
-runs ansible-playbook against the playbook. A sudoer can manually run
-this job, if desired, and it’s located at /etc/cron.hourly/ansible-pull.
-
-SEE ALSO []()
--------------
-
-tildegit.org(8), git(8), ansible-playbook(8)
-
-BUGS []()
----------
-
-No known bugs.
-
-AUTHOR []()
------------
-
-Uber Geek (ubergeek@thunix.net)
-
-------------------------------------------------------------------------
diff --git a/articles/chat.md b/articles/chat.md
deleted file mode 100644
index 485fde0..0000000
--- a/articles/chat.md
+++ /dev/null
@@ -1,47 +0,0 @@
-man {#man align="center"}
-===
-
-[NAME](#NAME)\
-[SYNOPSIS](#SYNOPSIS)\
-[DESCRIPTION](#DESCRIPTION)\
-[BUGS](#BUGS)\
-[SEE ALSO](#SEE%20ALSO)\
-[AUTHOR](#AUTHOR)\
-
-------------------------------------------------------------------------
-
-NAME []()
----------
-
-chat - chat script
-
-SYNOPSIS []()
--------------
-
-chat
-
-DESCRIPTION []()
-----------------
-
-This is a simple script to launch weechat for new users, and get them
-into the correct channel for chat and support.
-
-BUGS []()
----------
-
-\* If you have a customized list of servers in your weechat config
-already, this may try to connect you twice, and you’ll have two nicks
-going at once, which will be confusing. Once you’ve customized weechat
-to your liking, just invoke ’weechat’ or ’weechat-curses’.
-
-SEE ALSO []()
--------------
-
-weechat(8)
-
-AUTHOR []()
------------
-
-Uber Geek (ubergeek@thunix.net)
-
-------------------------------------------------------------------------
diff --git a/articles/contributing.md b/articles/contributing.md
deleted file mode 100644
index d422a70..0000000
--- a/articles/contributing.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## Contributing to the wiki
-
-Just do a PR on [tildegit](https://tildegit.org/thunix/wiki)
diff --git a/articles/email.md b/articles/email.md
deleted file mode 100644
index 12f16f6..0000000
--- a/articles/email.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Your Thunix Email
-
-Every thunix account comes with a functional and encrypted email address. This email is the same as your SSH login name. However, you will need to set a password on your thunix SSH account, using the PASSWD command in BASH. Though your SSH account will have a password, this will NOT affect how you log into your account using SSH or an SFTP client, as your public/private key pair will always work. The account password, however, will affect your thunix email address.
-
-Your email can be accessed in one of three ways:
-
-1. Running the Mutt email client through your SSH account
-2. Logging into your email account from our [web mail](https://www.thunix.net/webmail/) service
-3. Through an email client program installed on your computer, using IMAP
\ No newline at end of file
diff --git a/articles/sandbox.md b/articles/sandbox.md
deleted file mode 100644
index 4492017..0000000
--- a/articles/sandbox.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## Sandbox
-Just a sandbox
diff --git a/articles/ssh.md b/articles/ssh.md
deleted file mode 100644
index 2b4f8b4..0000000
--- a/articles/ssh.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## SSH and Thunix (And magic!) 
-
-When you [sign up](https://www.thunix.net/signup.php) for an account on thunix, you'll be given remote access to a Linux shell server, with web hosting, gopher hosting and email. And because of our [GDPR and privacy policy](https://www.thunix.net/gdpr.php), we take security seriously. This is why we use SSH key pairs to grant access to our server through SSH or SFTP.
-
-On our signup page, you'll seen an entry for a "Public SSH Key." SSH key pairs work on the basis of having two files; one is a public key that you can send to us when we create your account, while the other is a private key that you keep on your computer, away from public knowledge.
\ No newline at end of file
diff --git a/articles/thunix.md b/articles/thunix.md
deleted file mode 100644
index caf9ed1..0000000
--- a/articles/thunix.md
+++ /dev/null
@@ -1,224 +0,0 @@
-man {#man align="center"}
-===
-
-[NAME](#NAME)\
-[SYNOPSIS](#SYNOPSIS)\
-[ADMINISTRATORS](#ADMINISTRATORS)\
-[DESCRIPTION](#DESCRIPTION)\
-[Purpose](#Purpose)\
-[Terms of Service](#Terms%20of%20Service)\
-[Architecture](#Architecture)\
-[SEE ALSO](#SEE%20ALSO)\
-[AUTHOR](#AUTHOR)\
-
-------------------------------------------------------------------------
-
-NAME []()
----------
-
-Thunix - a public Linux server
-
-SYNOPSIS []()
--------------
-
-ssh thunix.net
-
-ADMINISTRATORS []()
--------------------
-
-List of system adminstrators are:
-
-\* amcclure - Email: amcclure@thunix.net\
-IRC: amcclure/irc.tilde.chat, amcclure/irc.freenode.net
-
-\* naglfar - Email: naglfar@thunix.net\
-IRC: Naglfar/irc.tilde.chat, Naglfar/irc.freenode.net
-
-\* ubergeek - Email: ubergeek@thunix.net, ubergeek@yourtilde.com\
-- IRC: ubergeek/irc.tilde.chat, ub3g33k/irc.freenode.net
-
-\* fosslinux - Email: fosslinux@thunix.net\
-- IRC: fosslinux/irc.tilde.chat
-
-DESCRIPTION []()
-----------------
-
-Thunix is a publicly accesible Linux server, running Debian 9, and
-managed using ansible playbooks.
-
-There are many optional things to do on Thunix. There is IRC chat
-availble with the weechat client. Most build tools are available to you
-as well, to include git, make, gcc, go, python, and perl. Mail facilties
-are also available for you to use via alpine, mutt, or even mailx.
-
-To enter chat, just type ’chat’ and hit enter. You’ll be dropped into
-the \#thunix chat room on the irc.tilde.chat network.
-
-You should create an account at tildegit.org, where Thunix’s git repos
-are hosted, to include the system configuration definition files.
-
-Ansible is the tool we use to configure the systems that comprise
-Thunix. Git and ansible are two tools your should familiarize yourself
-with.
-
-Purpose []()
-------------
-
-The goal of Thunix is to be an open and collaborative environment,
-conducive to learning the principles of \*Nix operating systems,
-regarding how they work, how to administer them, how to use them, and
-how to collaborate using them.
-
-Thunix tries to adhere to the values and philosophy of the Hacker Ethic
-whenever possible. The hacker ethics and beliefs as described by Levy
-are:
-
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* Access to computers - |
-|                          |                          | and anything which might |
-|                          |                          | teach you something      |
-|                          |                          | about the way the world  |
-|                          |                          | works - should be        |
-|                          |                          | unlimited and total.     |
-|                          |                          | Always yield to the      |
-|                          |                          | Hands-On Imperative!     |
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* All information       |
-|                          |                          | should be free           |
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* Mistrust authority -  |
-|                          |                          | promote decentralization |
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* Hackers should be     |
-|                          |                          | judged by their hacking, |
-|                          |                          | not criteria such as     |
-|                          |                          | degrees, age, race, sex, |
-|                          |                          | or position              |
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* You can create art    |
-|                          |                          | and beauty on a computer |
-+--------------------------+--------------------------+--------------------------+
-|                          |                          | \* Computers can change  |
-|                          |                          | your life for the better |
-+--------------------------+--------------------------+--------------------------+
-
-Thunix will never use proprietary software but users can do that if they
-wish. This is something they should avoid however.
-
-Terms of Service []()
----------------------
-
-Nothing is without its rules and regulations; thunix is no exception.
-Below are the site’s service terms. Everything in this page should be
-clear to everyone who wishes to use thunix’s services; failure to abide
-by these terms can result in penalties such as service bans and may
-result in legal action against any offending users, depending on the
-severity of each case and any other individuals who may have been
-affected. Thunix may conduct investigations on any suspected violations,
-and we will cooperate with law enforcement agencies with their
-investigations. Be sure to read this page carefully and understand it.
-
-You are responsibe for checking your local mail account from time to
-time. This email address is the only one we retain, and as such, any
-warnings and notices regarding your account, or service status will be
-sent to this account.
-
-+--------------------------------------+--------------------------------------+
-|                                      | \* Deliberately defacing the         |
-|                                      | accounts of other users              |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Deliberately trying to disrupt    |
-|                                      | thunix’s server                      |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Using thunix as a launch pad for  |
-|                                      | disrupting other servers             |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Using thunix to impersonate other |
-|                                      | websites and businesses for criminal |
-|                                      | purposes                             |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Storing/distributing pornography  |
-|                                      | of any genre and medium (especially  |
-|                                      | child pornography)                   |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Storing/distributing content that |
-|                                      | defames any individual               |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Promoting racial, ethnic,         |
-|                                      | religious, political and other forms |
-|                                      | of bigotry                           |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Storing/distributing, promoting,  |
-|                                      | or encouraging use of                |
-|                                      | pirated/cracked software, license    |
-|                                      | keys, license/registration           |
-|                                      | circumvention programs, or any       |
-|                                      | questionable programs/scripts that   |
-|                                      | can risk causing unauthorized        |
-|                                      | modifications, or disrupts network   |
-|                                      | services for any programs or         |
-|                                      | devices.                             |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Mining cryptocurrencies           |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Spamming on any forums, mailing   |
-|                                      | lists, irc channels, newsgroups,     |
-|                                      | etc.                                 |
-+--------------------------------------+--------------------------------------+
-|                                      | \* Leaking or publishing any user’s  |
-|                                      | or individual’s personal information |
-|                                      | without that person’s consent.       |
-+--------------------------------------+--------------------------------------+
-
-Copyright infringement is not allowed on thunix, and we will not allow
-any illegal content to be distributed. It’s also expected that all users
-respect the copyrights of those who produce original content of any kind
-and only share if the author or license grants you permission. Content
-hosted on accounts used for external file storage must also follow
-copyright law.
-
-If you want to request for content you own the copyright for to be
-removed from thunix, please refer to our abuse reporting page
-(https://www.thunix.net/abuse.php). In the email, please identify who
-you are, if you are the copyright holder or legally representing them,
-the exact files you want removed with links to the files and infringed
-content, and contact information such as phone numbers or a reply-to
-email address.
-
-Users that repeatedly violate the Terms of Service will have their
-account removed. Depending on the degree of the offense, their account
-may be removed immediately. These terms also apply to communication
-services such as forums, mailing lists, irc channels, newsgroups, and
-any other service either hosted on or used for thunix. If you come
-across anything that violates the terms of service, please let us know
-with the abuse reporting page (https://www.thunix.net/abuse.php).
-
-Architecture []()
------------------
-
-The Thunix system consists of one server, running Debian 9, which runs
-inside of an LXD container. This allows for an out-of-band
-administration of the host, in case of configuration-gone-awry.
-
-Hourly, thunix reaches out to tildegit, pull down the latest version of
-the configuration, and run the configuration tool, ensuring it is in a
-known, and easily replicable state.
-
-All repos for system configuration, Thunix-supplied/ran code is hosted
-on tildegit.org. Thunix users are recommended to create accounts on
-tildegit, and contribute pull requests to make their desired changes to
-the system, or very minimally, submit issues for problems and/or
-requests.
-
-SEE ALSO []()
--------------
-
-ssh(8), weechat(8), git(8), make(8), gcc(8), go(8), python(8), perl(8),
-alpine(8), mutt(8), mailx(8), ansible-playbook(8), tildegit.org(8)
-
-AUTHOR []()
------------
-
-Uber Geek (ubergeek@thunix.net) amcclure (amcclure@thunix.net)
-
-------------------------------------------------------------------------
diff --git a/articles/tildegit.org.md b/articles/tildegit.org.md
deleted file mode 100644
index d707b38..0000000
--- a/articles/tildegit.org.md
+++ /dev/null
@@ -1,61 +0,0 @@
-man {#man align="center"}
-===
-
-[NAME](#NAME)\
-[SYNOPSIS](#SYNOPSIS)\
-[DESCRIPTION](#DESCRIPTION)\
-[SEE ALSO](#SEE%20ALSO)\
-[BUGS](#BUGS)\
-[AUTHOR](#AUTHOR)\
-
-------------------------------------------------------------------------
-
-NAME []()
----------
-
-tildegit.org - a public web based source repository for the tildeverse
-
-SYNOPSIS []()
--------------
-
-https://tildegit.org
-
-DESCRIPTION []()
-----------------
-
-Tildegit is a web based source control system available for the
-tildeverse, that runs gitea. Thunix uses tildegit.org for all source
-control.
-
-The following git repos are used:
-
-\* ansible (https://tildegit.org/thunix/ansible) This repo stores the
-configuration spec for all machines comprising Thunix. The repo consists
-of declarative YAML files that describes the state the machines should
-be in.
-
-\* www (https://tildegit.org/thunix/www) This repo stores the source
-code that makes up the https:/thunix.net website. It’s mostly php.
-
-\* documentation (https://tildegit.org/thunix/documentation) This repo
-stores the man pages, and accompanying documentation for the system.
-
-\* thunix\_gopher (https://tildegit.org/thunix/thunix\_gopher) This repo
-houses our gopher hole
-
-SEE ALSO []()
--------------
-
-git(8), ansible(8)
-
-BUGS []()
----------
-
-No known bugs.
-
-AUTHOR []()
------------
-
-Uber Geek (ubergeek@thunix.net)
-
-------------------------------------------------------------------------

From 8956441002f504732842749520c80b5eabd83f04 Mon Sep 17 00:00:00 2001
From: ubergeek <ubergeek@yourtilde.com>
Date: Sun, 30 Jun 2019 13:05:09 -0400
Subject: [PATCH 13/14] changed one div from content to body

---
 wiki.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wiki.php b/wiki.php
index e82b6c6..ef224e7 100644
--- a/wiki.php
+++ b/wiki.php
@@ -16,7 +16,7 @@ print "<!DOCTYPE html>
 echo ( shell_exec("/usr/bin/pandoc includes/header.md") );
 
 print "<hr/>
-	<div id='content' style='width: 90%;'>
+	<div id='body' style='width: 90%;'>
 		<div id='sidebar' style='width: 20%;'>";
 echo ( shell_exec("/usr/bin/pandoc includes/sidebar.md") );
 

From 6c287fb279a32373c73e9704180d4a31bf3f5047 Mon Sep 17 00:00:00 2001
From: ubergeek <ubergeek@yourtilde.com>
Date: Sun, 30 Jun 2019 13:07:54 -0400
Subject: [PATCH 14/14] fixed floats for proper sidebar

---
 wiki.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wiki.php b/wiki.php
index ef224e7..e37bb73 100644
--- a/wiki.php
+++ b/wiki.php
@@ -17,11 +17,11 @@ echo ( shell_exec("/usr/bin/pandoc includes/header.md") );
 
 print "<hr/>
 	<div id='body' style='width: 90%;'>
-		<div id='sidebar' style='width: 20%;'>";
+		<div id='sidebar' style='width: 20%; float:left;'>";
 echo ( shell_exec("/usr/bin/pandoc includes/sidebar.md") );
 
 print "	</div>
-	<div id='content' style='width: 80%;'>";
+	<div id='content' style='width: 80%;float:right'>";
 
 echo ( shell_exec("/usr/bin/pandoc articles/$page.md") );
 
