Move Markdown manual to manual/dev/manual.md.

Makefile.am

@@ -160,7 +160,7 @@ check_DATA = tests/man.test
 # Making changes to the manpage without having the python deps means your
 # tests won't run. If you aren't making changes to the examples, you probably
 # don't care. But if you are, then you need to run the tests anyway.
-tests/man.test tests/manonig.test: $(srcdir)/docs/content/manual/manual.md
+tests/man.test tests/manonig.test: $(srcdir)/docs/content/manual/dev/manual.md
 if ENABLE_DOCS
 	$(AM_V_GEN) ( cd ${abs_srcdir}/docs && ./build_mantests.sh )
 else
@@ -174,7 +174,7 @@ endif
 # manpage, then we'll end up using the cached version. Otherwise, we need to
 # rebuild it.
 man_MANS = jq.1
-jq.1.prebuilt: $(srcdir)/docs/content/manual/manual.md $(srcdir)/docs/man/*
+jq.1.prebuilt: $(srcdir)/docs/content/manual/dev/manual.md $(srcdir)/docs/man/*
 if ENABLE_DOCS
 	$(AM_V_GEN) ( cd ${abs_srcdir}/docs && ./build_manpage.sh ) > $@
 else

docs/build_manpage.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-pandoc man/prologue.md content/manual/manual.md man/epilogue.md -s --to=man --lua-filter filters/filter.lua
+pandoc man/prologue.md content/manual/dev/manual.md man/epilogue.md -s --to=man --lua-filter filters/filter.lua

docs/build_mantests.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 mkdir -p tests
-pandoc content/manual/manual.md --lua-filter filters/tests.lua | split --separator='\0' -l1 - tests/
+pandoc content/manual/dev/manual.md --lua-filter filters/tests.lua | split --separator='\0' -l1 - tests/
 REGEX="test|match|capture|scan|split|splits|sub|gsub"
 grep -L -E $REGEX tests/* | xargs cat | sed 's/\x0/\n/g' > ../tests/man.test
 grep -l -E $REGEX tests/* | xargs cat | sed 's/\x0/\n/g' > ../tests/manonig.test

docs/build_manual.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 echo "headline: jq Manual"
 echo "body: |"
-pandoc content/manual/manual.md --lua-filter filters/filter.lua \
+pandoc content/manual/dev/manual.md --lua-filter filters/filter.lua \
   --shift-heading-level-by=1 --section-divs | \
   sed 's/\(.*\)/  \1/g'
 echo "toc:"
-pandoc content/manual/manual.md --lua-filter filters/toc.lua
+pandoc content/manual/dev/manual.md --lua-filter filters/toc.lua

docs/build_website.py

@@ -91,9 +91,9 @@ def copy_public_files(root=''):
 os.makedirs('output', exist_ok=True)
 copy_public_files()
 
-os.system("./build_manual.sh > content/manual/manual.yml")
+os.system("./build_manual.sh > content/manual/dev/manual.yml")
 
 for fn in glob.glob('content/**/*.yml', recursive=True):
     generate_file(env, fn)
 
-os.remove("content/manual/manual.yml")
+os.remove("content/manual/dev/manual.yml")