Merge branch 'master' of https://github.com/tildeclub/site into wiki-contributing

wiki/Makefile

@@ -13,6 +13,7 @@ index: dep-php index.html
 %.html: source/%.md
 	$(info building $@)
 	@$(PANDOC) \
+		--from markdown+backtick_code_blocks \
 		--template wiki.tmpl \
 		--lua-filter header-permalinks.lua \
 		--highlight-style=custom.theme \

wiki/index.php

@@ -8,16 +8,36 @@ include __DIR__."/../header.php";
 <p>here's the articles on our wiki:</p>
 <ul>
         <?php 
-              $article_to_title = [];
+              $category_to_articles = [];
               foreach (glob("source/*.md") as $file) {
                 $article = basename($file, ".md");
 		$title = preg_match("/title: (.*)/i", file_get_contents($file), $matches) ? $matches[1] : $article;
-                $article_to_title[$article] = $title;
+		$category = preg_match("/category: (.*)/i", file_get_contents($file), $matches) ? $matches[1] : 'default';
+		if (array_key_exists($category, $category_to_articles)) {
+			array_push($category_to_articles[$category], [$article, $title]);
+		} else {
+			$category_to_articles[$category] = [[$article, $title]];
+		}
+                ksort($category_to_articles);
               }
-              asort($article_to_title);
         ?>
-	<?php foreach ($article_to_title as $article => $title)	{ ?>
+	<?php foreach ($category_to_articles as $category => $articles)	{ ?>
-		<li><a href="/wiki/<?=$article?>.html"><?=$title?></a></li>
+		<li><?=$category?></li>
+			<ul>
+        <?php
+		$article_titles = [];
+		$article_names = [];
+		foreach ($articles as $article) {
+			array_push($article_names, $article[0]);
+                        array_push($article_titles, $article[1]);
+		}
+		$name_to_title = array_combine($article_names, $article_titles);
+                asort($name_to_title);
+		foreach ($name_to_title as $name => $title) { ?>
+                          <li><a href="/wiki/<?=$name?>.html"><?=$title?></a></li>
+	<?php   } ?>
+			</ul>
+
         <?php } ?>
 </ul>
 

wiki/source/2fa.md

@@ -1,6 +1,7 @@
 ---
 title: USING Two-Factor Authentication (2FA) ON TILDE.CLUB
 author: deepend
+category: tilde.club
 ---
 
 # Using Two-Factor Authentication (2FA).

wiki/source/archive.org.md

@@ -1,5 +1,6 @@
 ---
 title: archive.org
+category: links
 ---
 
-archive.org has an archive of tilde.club at http://web.archive.org/web/*/http://tilde.club                                      
+archive.org has an archive of tilde.club at [http://web.archive.org/web/*/http://tilde.club](http://web.archive.org/web/*/http://tilde.club)

wiki/source/bashblog.md

@@ -1,6 +1,9 @@
 --- 
 title: bashblog 
-author: deepend / benharri
+author: 
+  - deepend 
+  - benharri
+category: software
 ---
 
 

wiki/source/chat.md

@@ -3,6 +3,7 @@ title: Socializing and chat
 author: 
   - emv
   - benharri
+category: tilde.club
 ---
 
 ## irc
@@ -12,8 +13,8 @@ in the [tildeverse irc network](https://tilde.chat). the official channel for
 ~club is `#club`. stop by and say hello!
 
 run `chat` to open [weechat](https://weechat.org) auto-connected to our irc
-server. try launching [tmux](tmux.html) or [byobu](https://superuser.com/a/423397)
+server. try launching [tmux](tmux.html), [byobu](https://superuser.com/a/423397)
-to keep your chat session running.
+ or [screen](screen.html) to keep your chat session running.
 
 other clients like irssi are available as well! just connect to localhost on
 port 6667 and `/join #club`.

wiki/source/cli-for-beginners.md

@@ -1,6 +1,7 @@
 ---
 title: command line for absolute beginners
 author: cmccabe
+category: tutorial
 ---
 
 So, you want to join a public-access shell community like tilde.club,

wiki/source/code-of-conduct.md

@@ -1,6 +1,7 @@
 --- 
 title: code of conduct 
 author: benharri
+category: tilde.club
 ---
 
 > **tl;dr** learn by doing and helping. be excellent to each other. have fun!

wiki/source/donate.md

@@ -1,6 +1,7 @@
 ---
 title: donate to tilde.club
 author: deepend
+category: tilde.club
 ---
 
 ## Methods you can donate to tilde.club.
@@ -19,5 +20,4 @@ develop software using the many tools available to you on tilde.club.
 
 Tilde.club does cost money to run, however it all makes it worth it if the community is active and enjoying what we offer.
 
-
 ask on irc if you have questions!

wiki/source/edit_index.md

@@ -1,6 +1,7 @@
 ---
 title: Editing your index.html file
 author: vielmetti
+category: tutorial
 ---
 
 Type: `nano` index.html to open your index.html file and begin editing

wiki/source/email.md

@@ -1,6 +1,7 @@
 ---
 title: email
 author: benharri
+category: tutorial
 ---
 
 Your shiny, new tilde.club account comes with an email account. `alpine`  is a command-line email application to use it, as is `mutt`. Good old-fashioned `mail` works too, although it's a little cryptic.

wiki/source/error404.md

@@ -1,10 +1,11 @@
 ---
 title: custom 404
 author: deepend
+category: tutorial
 ---
 
-All users can now setup their own custom 404 error page.  Just add a file named 404.html in ~/public_html
+All users can now setup their own custom 404 error page.  Just add a file named `404.html` in `~/public_html`
 
-An example of one users custom 404: [~benharri](http://tilde.club/~benharri/not_here).
+An example of one user's custom 404: [~benharri](http://tilde.club/~benharri/not_here).
 
 

wiki/source/faq.md

@@ -1,6 +1,7 @@
 ---
 title: faq
 author: ford
+category: tilde.club
 ---
 
       _______________________________________

wiki/source/finding_index.md

@@ -1,5 +1,6 @@
 ---
 title: finding your index.html
+category: tutorial
 ---
 
 There are some basic command line commands you'll want to Google and learn, but for this tutorial you only need a few:

wiki/source/git.md

@@ -1,11 +1,12 @@
 ---
 title: how to use git
+category: tutorial
 ---
 
 `git` is a version control system. It's pretty confusing at first, but
 once you sort out what it can do and can't do, it starts to get better.
 
-This tutorial is pretty good: http://git-scm.com/docs/gittutorial
+This tutorial is pretty good: [http://git-scm.com/docs/gittutorial](http://git-scm.com/docs/gittutorial)
 
 The best way to learn `git` is to find someone who knows `git` really
 well and sort out issues with them. Ask on [IRC](chat.html) if you get

wiki/source/gopher.md

@@ -1,6 +1,7 @@
 ---
 title: gopher
 author: benharri
+category: tutorial
 ---
 
 tilde.club now serves gopher! we're using

wiki/source/json.md

@@ -1,5 +1,6 @@
 ---
 title: JSON
+category: software
 ---
 
 JSON is the "Javascript Object Notation", basically a file format for
@@ -9,7 +10,7 @@ Several tilde.club programs expose APIs essentially by spitting out
 JSON as their output, including e.g. the list of recently updated home
 pages at
 
-http://tilde.club/~delfuego/tilde.24h.json
+[http://tilde.club/~delfuego/tilde.24h.json](http://tilde.club/~delfuego/tilde.24h.json)
 
 If you're looking to parse JSON from the command line with a minimum of
 code, the `jq` program may be your thing. `jq` is a filter that takes

wiki/source/leafnode.md

@@ -1,7 +1,8 @@
 ---
 title: Leafnode
+category: links
 ---
 
 `leafnode` is a news client suitable for "leaf" nodes, that is nodes that have no downstream feeds.
 
-http://leafnode.sourceforge.net/
+[http://leafnode.sourceforge.net/](http://leafnode.sourceforge.net/)

wiki/source/netiquette.md

@@ -1,5 +1,6 @@
 ---
 title: tilde.club netiquette
+category: tilde.club
 ---
 
 ## Two phrases we use a lot

wiki/source/safe-scripting-the-tilde-way.md

@@ -1,6 +1,7 @@
 ---
 title: safe scripting the tilde way
 author: michaelcoyote
+category: tutorial
 ---
 
 Welcome to tilde.club. For many of you this may be your first multi-user host and for even more of you this may be your *first* host. Welcome to all of you.  

wiki/source/screen.md

@@ -1,5 +1,6 @@
 ---
 title: terminal multiplexers - screen
+category: software
 ---
 
 `screen` is a unix utility that lets you manage multiple shells from within a single window. You switch between them with a few keystrokes. When you disconnect it keeps the processes alive, and you can reconnect from another login.

wiki/source/security.md

@@ -1,6 +1,7 @@
 ---
 title: Editing Basic UNIX Security the Tilde way
 author: michaelcoyote
+category: tutorial
 ---
 
 
@@ -147,7 +148,7 @@ Back at our command line, lets type the command `id`:
 
 The `id` command is a tool to show us how the system keeps track of us. From this we can see that according to the system, our user ID (or uid) is 501, and our group id is also 501.
 
-    - Homework
+- Homework
     - Run `id` in your own directory, then run
     - Run `id -u root`
     - use the `grep` command to find your uid in the `/etc/passwd` file

wiki/source/slrn.md

@@ -1,10 +1,11 @@
 ---
 title: slrn
+category: links
 ---
 
 ``slrn`` is a news reader for [Usenet](usenet-news.html).
 
-Documentation for slrn can be found at http://slrn.sourceforge.net 
+Documentation for slrn can be found at [http://slrn.sourceforge.net](http://slrn.sourceforge.net)
 
-Tilde-specific slrn info is on http://tilde.club/~joeld/slrn.html
+Tilde-specific slrn info is on [http://tilde.club/~joeld/slrn.html](http://tilde.club/~joeld/slrn.html)
 

wiki/source/ssh.md

@@ -1,6 +1,7 @@
 ---
 author: benharri
 title: ssh
+category: tutorial
 ---
 
 

wiki/source/sshfs.md

@@ -1,12 +1,13 @@
 ---
 author: jeffbonhag
 title: SSHFS
+category: software
 ---
 
 On OS X:
 
-  Download the lastest version of OSXFUSE: [http://osxfuse.github.io/](http://osxfuse.github.io/)
+- Download the lastest version of OSXFUSE: [http://osxfuse.github.io/](http://osxfuse.github.io/)
-  brew install sshfs
+- `brew install sshfs`
 
 
 Now you can mount a ssh server by issuing the following commands:
@@ -14,12 +15,9 @@ Now you can mount a ssh server by issuing the following commands:
     mkdir tilde.club
     sshfs jeffbonhag@tilde.club:/home/jeffbonhag tilde.club
 
-
-
-
 If you're on Linux and want to make an entry in your fstab:
 
-mkdir -p /mnt/tilde.club
+    mkdir -p /mnt/tilde.club
 
 Put an entry in your `/etc/fstab` like this:
 
@@ -32,7 +30,7 @@ then you can do
 If you want to use an identity file to mount instead of a password, this may
 work (untested):
 
-jeffbonhag@tilde.club:/home/jeffbonhag /mnt/tilde.club  fuse.sshfs _netdev,user,idmap=user,transform_symlinks,identityfile=/home/USER_C/.ssh/id_rsa,allow_other,default_permissions,uid=USER_C_ID,gid=GROUP_C_ID,umask=0 0 0
+    jeffbonhag@tilde.club:/home/jeffbonhag /mnt/tilde.club  fuse.sshfs _netdev,user,idmap=user,transform_symlinks,identityfile=/home/USER_C/.ssh/id_rsa,allow_other,default_permissions,uid=USER_C_ID,gid=GROUP_C_ID,umask=0 0 0
 
 Although -- do you really need to do this?  It just occurred to me that the
 first command is just as easy, and probably makes more sense.

wiki/source/time-zone.md

@@ -1,5 +1,6 @@
 ---
 title: time zones
+category: tutorial
 ---
 
 The timezone by default on the server is UTC.
@@ -10,5 +11,5 @@ to find the correct timezone name that you'll need to export as the `TZ` environ
 for example, if you're in eastern time, add something like this
 `export TZ="America/Detroit"`
 
-to your `.bashrc` .
+to your `.bashrc`
 

wiki/source/tin.md

@@ -1,5 +1,6 @@
 ---
 title: tin
+category: software
 ---
 
 tin is a threaded NNTP and spool based [UseNet](usenet-news.html) newsreader for a variety of platforms.

wiki/source/tmux.md

@@ -1,5 +1,6 @@
 ---
 title: terminal multiplexers - tmux
+category: software
 ---
 
 TMUX IS THE BEST. Here's a super basic primer.

wiki/source/tunnelblick.md

@@ -1,5 +1,6 @@
 ---
 title: Tunnelblick
+category: links
 ---
 
 `tunnelblick` is an application for your Mac that allows you to configure
@@ -8,6 +9,6 @@ tilde.club via a network that does not allow high UDP ports; with a properly
 configured tunnel, you can still run [[mosh]] as your shell and keep on
 truckin.
 
-https://code.google.com/p/tunnelblick/
+[https://tunnelblick.net/](https://tunnelblick.net/)
 
 To find a VPN endpoint, see the [VPN Gate](vpn-gate.html) project.

wiki/source/usenet-news.md

@@ -1,5 +1,6 @@
 ---
 title: usenet news
+category: tutorial
 ---
 
 ## this is out of date and the netnews server is down

wiki/source/vimrc.md

@@ -1,5 +1,6 @@
 ---
 title: .vimrc file
+category: tutorial
 ---
 
 The file `.vimrc` in your home directory has instructions for [[vim]]

wiki/source/vpn-gate.md

@@ -1,12 +1,13 @@
 ---
 title: VPN Gate
+category: links
 ---
 
 `VPN Gate` is a project from U Tsukuba in Japan that allows you to 
 evade censorship and filtering by setting up VPN tunnels. It was
 designed with the Great Firewall of China in mind.
 
-http://www.vpngate.net/en/
+[http://www.vpngate.net/en/](http://www.vpngate.net/en/)
 
 You may need client side software to make this work; [tunnelblick](tunnelblick.html) is one
 such service on the Mac.

wiki/source/wiki.md

@@ -8,9 +8,9 @@ category: tilde.club
 
 # Want to contribute to this wiki?
 
-There are N ways to contribute to this wiki:
+There are at least 5 ways to contribute to this wiki:
 
-## The super ultra easy way
+## The super ultra easy 
 
 Send an email to [~audiodude](../~audiodude), audiodude@tilde.club. Put the
 proposed contents in the email in markdown format. You don't have to worry
@@ -71,13 +71,18 @@ You can do this right from the Github GUI!
 1. Make a new article or update an existing one. Make sure that you create the
    title, author, and category keys in the yaml frontmatter (see an existing
     article for an example).
+1. grab a copy of the site's source code
+    git clone https://github.com/tildeclub/site tilde.club && cd tilde.club/wiki
 
-1. submit the code via a PR on github or with git-send-email(1) to root@tilde.club
+2. make a new article or update an existing one. make sure that you create the
+   title and author keys in the yaml frontmatter (see an existing article for
+   an example)
+
+3. submit the code via a PR on github or with git-send-email(1) to root@tilde.club
    see [git-send-email.io](https://git-send-email.io) for more info on how to use
    it. if you're working locally on tilde.club, you won't have to configure
    anything; git will use the system's sendmail to handle the email.
 
-
 # Most importantly
 
 Ask on irc if you have questions!

wiki/wiki.tmpl

@@ -76,7 +76,9 @@ $highlighting-css$
 		</nav>
         <hr>
 		$endif$
-		$body$
+<!-- unindent body so that code blocks don't have extra indents. See
+     https://stackoverflow.com/questions/42773587/code-block-formatting-issues-with-bootstrap-and-pandoc -->
+$body$
 		$for(include-after)$
 		$include-after$
 		$endfor$