Merge branch 'content' into gh-pages

8 files changed, 149 insertions, 22 deletions

diff --git a/_articles/2015-02-12-adding-articles-to-irssi.org.markdown b/_articles/2015-02-12-adding-articles-to-irssi.org.markdown
index ad36fce..d8c1f0f 100644
--- a/_articles/2015-02-12-adding-articles-to-irssi.org.markdown
+++ b/_articles/2015-02-12-adding-articles-to-irssi.org.markdown
@@ -1,9 +1,8 @@
 ---
 layout: post
-title: "Contributing articles to irssi.org"
-author: "Nicolas Kuttler"
-email: "irssi@kuttler.eu"
-web: "http://kuttler.eu"
+title: Contributing articles to irssi.org
+author: Nicolas Kuttler
+web: http://kuttler.eu
 ---
 
 Forking the upstream repository
@@ -26,3 +25,4 @@ TODO
 - We could build a form with a [markdown editor](http://vuejs.org/examples/),
   where should we submit it to though?
 - Policy for images and other included content?
+- Email and web address and are optional
diff --git a/_articles/2015-02-12-hacking-irssi.org.markdown b/_articles/2015-02-12-hacking-irssi.org.markdown
index ae90fd5..fe93aef 100644
--- a/_articles/2015-02-12-hacking-irssi.org.markdown
+++ b/_articles/2015-02-12-hacking-irssi.org.markdown
@@ -1,9 +1,8 @@
 ---
 layout: post
-title: "Hacking irssi.org"
-author: "Nicolas Kuttler"
-email: "irssi@kuttler.eu"
-web: "http://kuttler.eu"
+title: Hacking irssi.org
+author: Nicolas Kuttler
+web: http://kuttler.eu
 ---
 
 Get a local copy
diff --git a/_layouts/page.html b/_layouts/page.html
new file mode 100644
index 0000000..ac875a1
--- /dev/null
+++ b/_layouts/page.html
@@ -0,0 +1,6 @@
+---
+layout: default
+---
+
+<h1>{{ page.title }}</h1>
+{{ page.content | markdownify }}
diff --git a/about/index.markdown b/about/index.markdown
index d3ce479..e04b107 100644
--- a/about/index.markdown
+++ b/about/index.markdown
@@ -1,36 +1,68 @@
 ---
-layout: default
+layout: page
 title: About Irssi
 ---
 
-About Irssi
-===========
-
 Introduction
 ------------
 
-Irssi is a terminal based IRC client for UNIX systems. It also supports SILC and ICB protocols via plugins.
+Irssi is a terminal based IRC client for UNIX systems. It also supports SILC
+and ICB protocols via plugins.
 
 ### Greatest features
-You might be wondering what makes Irssi such an easy and comfortable client to use; Joost Vunderink wrote a summary of the most beneficial Irssi features.
+You might be wondering what makes Irssi such an easy and comfortable client
+to use; Joost Vunderink wrote a summary of the most beneficial Irssi features.
 
 ### Autologging
-Irssi will automatically log any channels, queries or special windows that you want. The logfiles will be separated per IRC network, and even log rotation is supported. Log file formats, themes and destination directories can be easily configured with the Irssi log settings.
+Irssi will automatically log any channels, queries or special windows that
+you want. The logfiles will be separated per IRC network, and even log
+rotation is supported. Log file formats, themes and destination directories
+can be easily configured with the Irssi log settings.
 
 ### Formats and themes
-Theming is a popular item in todays desktop enviroments, it's an easy yet powerful way to customize your Irssi client's look and feel. Irssi's formatting is modular which means you can just change the appearance of the objects and all items contaning that object will change into that format.
+Theming is a popular item in todays desktop enviroments, it's an easy yet
+powerful way to customize your Irssi client's look and feel. Irssi's
+formatting is modular which means you can just change the appearance of the
+objects and all items contaning that object will change into that format.
 
 ### Configurable keybindings
-This feature is a piece of art; it allows you to modify the default keybindings and create your own so you can customize your client. If these keybindings are tuned, you can switch through the windows in no time, execute commands and even complete objects with these bindings.
+This feature is a piece of art; it allows you to modify the default
+keybindings and create your own so you can customize your client. If these
+keybindings are tuned, you can switch through the windows in no time, execute
+commands and even complete objects with these bindings.
 
 ### Paste detection
-If you have ever pasted a bunchload of text into a wrong channel, you know how hard the consequences can be. Irssi tries to detect when you are pasting large amounts of text, by looking at the speed that characters are entered; if such pasting is detected [TAB]-characters are sent as-is instead of being tab-completed and eventually ending up in a wrong destination window. When Irssi detects such a pasting, you will get the option to either abort the paste or execute the paste, this way you have total control of the pasting.
+If you have ever pasted a bunchload of text into a wrong channel, you know
+how hard the consequences can be. Irssi tries to detect when you are pasting
+large amounts of text, by looking at the speed that characters are entered;
+if such pasting is detected [TAB]-characters are sent as-is instead of being
+tab-completed and eventually ending up in a wrong destination window. When
+Irssi detects such a pasting, you will get the option to either abort the
+paste or execute the paste, this way you have total control of the pasting.
 
 ### Perl scripting
-Perl is one of the most used programming languages around the globe and integrating Perl into applications means flexible and powerful scripting capabilities. The entire behavior and appearence of Irssi can be modified within these Perl scripts. Irssi provides a script archive with many contributed Irssi scripts which provide both useful extra features and the required assistance to make your own scripts.
+Perl is one of the most used programming languages around the globe and
+integrating Perl into applications means flexible and powerful scripting
+capabilities. The entire behavior and appearence of Irssi can be modified
+within these Perl scripts. Irssi provides a script archive with many
+contributed Irssi scripts which provide both useful extra features and the
+required assistance to make your own scripts.
 
 ### Irssi-proxy
-This is much more than just a bouncer, Irssi-proxy is a plugin which allows to bind a port to each IRC server you are connected to. This means that instead of having to remember to identify with a password, you can just connect to the Irssi-proxy with a server password. The copy of Irssi running the proxy works just as a normal client which you can use, but you can also connect one or more clients to it to share the connections. Using Irssi as a proxy has the major advantage of Irssi's power as an IRC client. You never have to worry about losing your connection to IRC. Even if you don't want to use Issi as a client, I can strongly recommend it as a proxy because you can just connect to it with any IRC client by just connecting to the specified port instead of SSH-ing to the machine that your Irssi is running on.
+This is much more than just a bouncer, Irssi-proxy is a plugin which allows
+to bind a port to each IRC server you are connected to. This means that
+instead of having to remember to identify with a password, you can just
+connect to the Irssi-proxy with a server password. The copy of Irssi running
+the proxy works just as a normal client which you can use, but you can also
+connect one or more clients to it to share the connections. Using Irssi as a
+proxy has the major advantage of Irssi's power as an IRC client. You never
+have to worry about losing your connection to IRC. Even if you don't want to
+use Issi as a client, I can strongly recommend it as a proxy because you can
+just connect to it with any IRC client by just connecting to the specified
+port instead of SSH-ing to the machine that your Irssi is running on.
 
 ### Upgrades
-Upgrading your Irssi client to the latest version can be easily done without losing the connections to the IRC servers and without restarting Irssi. You can use the UPGRADE command to load the new Irssi binary and restoring your connections.
+Upgrading your Irssi client to the latest version can be easily done
+without losing the connections to the IRC servers and without restarting
+Irssi. You can use the UPGRADE command to load the new Irssi binary and
+restoring your connections.
diff --git a/articles/index.markdown b/articles/index.markdown
index a8fcfde..252470f 100644
--- a/articles/index.markdown
+++ b/articles/index.markdown
@@ -1,6 +1,6 @@
 ---
-title: Articles
 layout: default
+title: Articles
 ---
 
 Articles
diff --git a/support/index.markdown b/support/index.markdown
new file mode 100644
index 0000000..416f51d
--- /dev/null
+++ b/support/index.markdown
@@ -0,0 +1,32 @@
+---
+layout: page
+title: Support
+---
+
+- [Mailing lists](mailinglists)
+- [IRC](irc)
+
+If your irssi crashes, it's always a bug. Please read bugreporting howto
+and send one. For other type of bugs, it would still be nice to hear of them,
+but chances are that it's already known. You could check the TODO file which
+comes with irssi if it's already there. Send all bugreports to irssi's bug
+reporting system.
+
+Compiling problems
+------------------
+
+Read the INSTALL file that comes with irssi, it explains the most common
+problems.
+
+Still problems?
+---------------
+
+Read [FAQ]()
+before asking anything.
+[Startup-HOWTO]() is quite useful as well.
+And if you just want to know about some setting, you could very well guess
+it yourself too, like if you want to change something related to windows,
+try `/SET window`.
+
+If you still haven't found what you're looking for, you can send mail to
+[mailing lists](mailinglists/), or join to #irssi.
diff --git a/support/irc/index.markdown b/support/irc/index.markdown
new file mode 100644
index 0000000..fa6cf93
--- /dev/null
+++ b/support/irc/index.markdown
@@ -0,0 +1,32 @@
+---
+layout: page
+title: IRC
+---
+
+Official international channels
+-------------------------------
+
+- \#irssi at IRCnet - English only
+- \#irssi at EFnet - English only
+
+Non-English channels
+--------------------
+
+- \#irssi.fi at IRCnet - Finnish
+- \#irssi.de at IRCnet - German
+- \#irssi.pl at IRCnet - Polish
+
+There are also some active non-official channels in other networks, eg.
+Freenode and QuakeNet.
+
+If you have something to ask, **please JUST ASK instead of asking if you
+can ask or if someone can help or if anyone is there**.
+
+Servers
+-------
+
+Most IRCnet servers aren't open for everyone, so if you're having trouble
+finding one, use open.ircnet.net which resolves to a number of open IRCnet
+servers that you should be able to use.
+
+For EFNet, use `irc.efnet.net`. Most countries have an `irc.efnet.TLD`.
diff --git a/support/mailinglists/index.markdown b/support/mailinglists/index.markdown
new file mode 100644
index 0000000..6abbc96
--- /dev/null
+++ b/support/mailinglists/index.markdown
@@ -0,0 +1,26 @@
+---
+layout: page
+title: Mailing lists
+---
+
+irssi-users
+-----------
+
+- [Subscribe](mailto:irssi-users-request@dragoncat.net?subject=subscribe)
+  sending mail to **irssi-users-request@dragoncat.net** with subject
+  **subscribe**.
+- [Unsubscribe](mailto:irssi-users-request@dragoncat.net?subject=unsubscribe)
+  with subject **unsubscribe** (same email as above).
+- [Send mails](irssi-users@dragoncat.net) to **irssi-users@dragoncat.net**.
+- [Read](http://www.dragoncat.net/lists/irssi-users) the irssi-users archives.
+
+irssi-dev
+---------
+
+- [Subscribe](irssi-dev-request@dragoncat.net?subject=subscribe)
+  sending mail to **irssi-dev-request@dragoncat.net** with subject
+  **subscribe**.
+- [Unsubscribe](irssi-dev-request@dragoncat.net?subject=unsubscribe)
+  with subject **unsubscribe** (same email as above).
+- [Send](irssi-dev@dragoncat.net) mails to **irssi-dev@dragoncat.net**.
+- [Read](http://www.dragoncat.net/lists/irssi-dev) the irssi-dev archives.