Merge remote-tracking branch 'jnovack/markdown'

Conflicts:
	ChangeLog

diff --combined ChangeLog
index 4a9cfc5d7be6c5e0b44f18ba7ce884a8b779adf9,8557be7f9beead4c78a936983bafd4e6aa44ce4b..1dc1447a0165b431f0a5d6178c66965fb1286363
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
+ 2012-09-18  Justin J. Novack  <jnovack@gmail.com>
+ 
+       * Add Markdown as a known file-type.
+ 
 +2012-09-17  Justin J. Novack <jnovack@gmail.com>
 +
 +      * Add OpenID authentication
 +
  2012-09-16  Christian Weiske  <cweiske@cweiske.de>
  
        * Implement request #12: DOAP documents for all pastes

diff --combined README.rst
index 2ad6ff01f0db60aab3ef5f9e87a5b6892a0ca1e1,4a157bf606bce64ba5dc999ee5bd12ce528d53fe..d41d89bf61f9f5e9e7878d50802b1405473adf3f
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -84,6 -84,9 +84,9 @@@ phorkie stands on the shoulders of gian
    $ pear channel-discover zustellzentrum.cweiske.de
    $ pear install zz/mime_type_plaindetect-alpha
  
+   $ pear channel-discover pear.michelf.ca
+   $ pear install michelf/Markdown
+ 
  Note that this version of GeSHi is a bit outdated, but it's the fastest
  way to install it.
  
@@@ -192,11 -195,6 +195,11 @@@ URL
    List all pastes, with optional page
  ``/new``
    Shows form for new paste
 +``/login``
 +  Login page for protecting site
 +``/user``
 +  Edit logged-in user information
 +
  
  Internal directory layout
  =========================
@@@ -235,7 -233,4 +238,7 @@@ If you use nginx, place the following l
  
      rewrite ^/search$ /search.php;
      rewrite ^/search/([0-9]+)$ /search.php?page=$1;
 +
 +    rewrite ^/login$ /login.php;
 +    rewrite ^/user$ /user.php;
    }

diff --combined data/config.default.php
index a0877678344dccf15e30eaee6aec9452b90a8536,3fc48f68226445e72e221f7c25118814e216fd4f..abcb43e071a4cdcd397495c60f6fdf4ccd9f7be7
--- 1/data/config.default.php
--- 2/data/config.default.php
+++ b/data/config.default.php
@@@ -12,15 -12,6 +12,15 @@@ $GLOBALS['phorkie']['cfg'] = array
      'geshi'         => 'MediaWiki/geshi/geshi/geshi.php',
      'index'         => 'new'//"new" or "list"
  );
 +$GLOBALS['phorkie']['auth'] = array(
 +    // 0 = public, no authentication, 1 = protect adds/edits/deletes,
 +    // 2 = require authentication
 +    'securityLevel'   => 0,
 +    'listedUsersOnly' => false,
 +    'users'           => array(),             // Array of OpenIDs that may login
 +    'anonymousName'   => 'Anonymous',         // Email for non-authenticated commits
 +    'anonymousEmail'  => 'anonymous@phorkie', // Email for non-authenticated commits
 +);
  $GLOBALS['phorkie']['tools'] = array(
      '\\phorkie\\Tool_Xmllint' => true,
      '\\phorkie\\Tool_PHPlint' => true,
@@@ -66,6 -57,11 +66,11 @@@ $GLOBALS['phorkie']['languages'] = arra
          'mime'  => 'application/javascript',
          'geshi' => 'javascript'
      ),
+     'md' => array(
+         'title' => 'Markdown',
+         'mime'  => 'text/x-markdown',
+         'renderer' => '\\phorkie\\Renderer_Markdown'
+     ),
      'pl' => array(
          'title' => 'Perl',
          'mime'  => 'application/x-perl',