<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
  <channel>
    <language>en-us</language>
    <title>Tiki RSS feed for the wiki pages</title>
    <description>Last modifications to the Wiki.</description>
    <image>
      <url>http://tiki.seesslen.net/img/tiki/Tiki_WCG.png</url>
      <title>Feed logo</title>
      <link>http://tiki.seesslen.net/</link>
    </image>
    <pubDate>Sun, 20 May 2012 22:00:25 +0000</pubDate>
    <generator>Zend_Feed_Writer 1.11.11 (http://framework.zend.com)</generator>
    <link>http://tiki.seesslen.net/</link>
    <atom:link rel="self" type="application/rss+xml" href="http://tiki.seesslen.net/tiki-wiki_rss.php?ver=2"/>
    <item>
      <title>mase:projects:pax2</title>
      <description><![CDATA[<blockquote>- <ul><li><a href='#Einleitung' class='link'>Einleitung</a></blockquote><blockquote>- </li><li><a href='#Subpages' class='link'>Subpages</a></blockquote><blockquote>- </li><li><a href='#Todo' class='link'>Todo</a></blockquote><blockquote>- </li><li><a href='#Misc' class='link'>Misc</a></blockquote><blockquote>- </li><li><a href='#ToDo' class='link'>ToDo</a></blockquote><blockquote>- </li><li><a href='#Implementation-Matrix' class='link'>Implementation-Matrix</a></blockquote><blockquote>- </li><li><a href='#Konkreter_Plan_Babysteps' class='link'>Konkreter Plan, Babysteps</a></blockquote><blockquote>- </li><li><a href='#Tickets' class='link'>Tickets</a></blockquote><blockquote>- </li></ul></li><li><a href='#PAX2' class='link'>PAX2</a></blockquote><blockquote>- &lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<del class="diffchar deleted" style="color: red; text-decoration: none"><strong>2</strong></del>&quot; &gt;cd ~/src/paba</blockquote><blockquote>+ &lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;&lt;li&gt;&lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<ins class="diffchar inserted" style="color: blue; text-decoration: none"><strong>1</strong></ins>&quot; &gt;cd ~/src/paba</blockquote>]]></description>
      <pubDate>Sat, 19 May 2012 18:49:48 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Apax2</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Apax2</guid>
    </item>
    <item>
      <title>mase:howtos:git-svn</title>
      <description><![CDATA[<blockquote>- &lt;/li&gt;&lt;/ul&gt;&lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<del class="diffchar deleted" style="color: red; text-decoration: none"><strong>5</strong></del>&quot; &gt;[svn-remote &quot;svn&quot;]</blockquote><blockquote>+ &lt;/li&gt;&lt;/ul&gt;&lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<ins class="diffchar inserted" style="color: blue; text-decoration: none"><strong>3</strong></ins>&quot; &gt;[svn-remote &quot;svn&quot;]</blockquote><blockquote>- &lt;/li&gt;&lt;/ul&gt;with the first 'svn fetch' the complete repository automatically gets merged into master (or current branch?), all further merges have to be done manually: &lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<del class="diffchar deleted" style="color: red; text-decoration: none"><strong>6</strong></del>&quot; &gt;git merge svn/trunk --no-ff&lt;/pre&gt;&lt;br /&gt;</blockquote><blockquote>+ &lt;/li&gt;&lt;/ul&gt;with the first 'svn fetch' the complete repository automatically gets merged into master (or current branch?), all further merges have to be done manually: &lt;pre class=&quot;codelisting&quot;  data-wrap=&quot;1&quot;  dir=&quot;ltr&quot;  style=&quot;white-space:pre-wrap; white-space:-moz-pre-wrap !important; white-space:-pre-wrap; white-space:-o-pre-wrap; word-wrap:break-word;&quot; id=&quot;codebox<ins class="diffchar inserted" style="color: blue; text-decoration: none"><strong>4</strong></ins>&quot; &gt;git merge svn/trunk --no-ff&lt;/pre&gt;&lt;br /&gt;</blockquote>]]></description>
      <pubDate>Sat, 19 May 2012 09:18:32 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Agit-svn</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Agit-svn</guid>
    </item>
    <item>
      <title>mase:projects:paba</title>
      <pubDate>Thu, 17 May 2012 13:00:55 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Apaba</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Apaba</guid>
    </item>
    <item>
      <title>mase:projects</title>
      <description><![CDATA[<blockquote>- </li><li><a href='#Own_projects' class='link'>Own projects</a></blockquote><blockquote>- </li><li><a href='#Plans' class='link'>Plans</a></blockquote><blockquote>- </li><li><a href='#Foreign_projects' class='link'>Foreign projects</a></blockquote><blockquote>- </li><li><a href='#Misc' class='link'>Misc</a></blockquote>]]></description>
      <pubDate>Wed, 16 May 2012 12:41:21 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects</guid>
    </item>
    <item>
      <title>mase:howtos</title>
      <description><![CDATA[<blockquote>- </li><li><a href='#Misc' class='link'>Misc</a></blockquote><blockquote>- </li><li><a href='#Linux_Administration' class='link'>Linux Administration</a></blockquote><blockquote>- </li><li><a href='#Linux_Programming' class='link'>Linux/Programming</a></blockquote>]]></description>
      <pubDate>Mon, 14 May 2012 16:26:19 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos</guid>
    </item>
    <item>
      <title>mase:eat</title>
      <pubDate>Mon, 14 May 2012 16:00:11 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aeat</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aeat</guid>
    </item>
    <item>
      <title>mase:howtos:cyrus</title>
      <description><![CDATA[<blockquote>- </li><li><a href='#Exim_with_LDAP' class='link'>Exim with LDAP</a></blockquote><blockquote>- <ul><li><a href='#Router_for_checking_address' class='link'>Router for checking address</a></blockquote><blockquote>- </li><li><a href='#Redirect_for_aliases' class='link'>Redirect for aliases</a></blockquote><blockquote>- </li><li><a href='#Info' class='link'>Info</a></blockquote><blockquote>- </li><li><a href='#Test_the_routing' class='link'>Test the routing</a></blockquote><blockquote>- </li><li><a href='#Snippets' class='link'>Snippets</a></blockquote><blockquote>- </li></ul></li><li><a href='#Cyrus_with_LDAP' class='link'>Cyrus with LDAP</a></blockquote>]]></description>
      <pubDate>Sun, 13 May 2012 10:17:20 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Acyrus</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Acyrus</guid>
    </item>
    <item>
      <title>mase:howtos:git_svn</title>
      <pubDate>Wed, 02 May 2012 18:36:51 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Agit_svn</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Ahowtos%3Agit_svn</guid>
    </item>
    <item>
      <title>mase:projects:hurd</title>
      <description><![CDATA[<blockquote>- </li><li><a href='#Hurd_PAX' class='link'>Hurd@PAX</a></blockquote><blockquote>- </li><li><a href='#Links' class='link'>Links</a></blockquote><blockquote>- </li><li><a href='#Versuch_II' class='link'>Versuch II</a></blockquote>]]></description>
      <pubDate>Mon, 09 Apr 2012 11:15:00 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Ahurd</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aprojects%3Ahurd</guid>
    </item>
    <item>
      <title>mase:entities</title>
      <pubDate>Thu, 22 Mar 2012 09:44:32 +0000</pubDate>
      <link>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aentities</link>
      <guid>http://tiki.seesslen.net/tiki-index.php?page=mase%3Aentities</guid>
    </item>
  </channel>
</rss>

