Merge branch 'no_jekyll' of https://github.com/skagedal/manual into no_jekyll

Conflicts:
	build.rb

diff --cc build.rb
index 4edb695ec77e5f177c3cb27e5d483b1b1b0e32c8,8246d8e88827aa0f8a4c7992bc363e90632364f7..77bca1008a70d3b78989eec352bdab501a37794b
--- 1/build.rb
--- 2/build.rb
+++ b/build.rb
@@@ -218,50 -222,12 +218,51 @@@ class Tag_prevnext < Liquid::Ta
      end
  end
  
 -Liquid::Template.register_tag('tree', Tag_tree)
 -Liquid::Template.register_tag('children', Tag_children)
 -Liquid::Template.register_tag('prevnext', Tag_prevnext)
 +class Server
 +    def start_watcher()
 +      require 'listen'
 +
 +        listener = Listen.to(CONFIG[:pages_dir], wait_for_delay: 1.0, only: /.html$/) do |modified, added, removed|
 +            Site.new.build
 +        end
 +        listener.start
 +        listener
 +    end
 +
++<<<<<<< HEAD
 +    def run(options)
 +        require 'webrick'
 +      listener = options[:watch] && start_watcher
 +          
 +        puts "Serving at http://localhost:8000/ ..."
 +        server = WEBrick::HTTPServer.new :Port => 8000, :DocumentRoot => CONFIG[:output_dir]
 +      trap 'INT' do 
 +            server.shutdown 
 +        end
 +      server.start
 +        listener.stop if listener
 +    end  
 +end
 +
 +def main
 +    Liquid::Template.register_tag('tree', Tag_tree)
 +    Liquid::Template.register_tag('children', Tag_children)
 +    Liquid::Template.register_tag('prevnext', Tag_prevnext)
  
 -if defined? Liquid::Template.error_mode
 -    Liquid::Template.error_mode = :strict
 +    if defined? Liquid::Template.error_mode
 +        Liquid::Template.error_mode = :strict
 +    end
 +
 +    options = {}
 +    OptionParser.new do |opts| 
 +        opts.on("--watch", "Watch for changes") { options[:watch] = true }
 +    end.parse!
 +
 +    Site.new.build
 +
 +    if ARGV == ['serve']
 +        Server.new.run(options)
 +    end
  end
  
 -Site.new.run
 +main