From: Pieter Lexis Date: Tue, 26 Aug 2014 10:27:57 +0000 (+0200) Subject: Fix tables X-Git-Tag: rec-3.7.0-rc1~161^2^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff257d84fa465b5272a4bf646a789ec98860f8af;p=thirdparty%2Fpdns.git Fix tables --- diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile index fcfb8657c1..193c03e3a5 100644 --- a/pdns/docs/Makefile +++ b/pdns/docs/Makefile @@ -3,22 +3,20 @@ all: pdns.txt pdns.pdf html/index.html html.tar.bz2 pdns-expanded.html manpages clean: - rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1 + rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1 html-new doc-build manpages: dnsdist.1 pdns_recursor.1 rec_control.1 dnstcpbench.1 -html-new: html-new/index.html +html-new/index.html: process-md mkdocs.yml + mkdocs build -html-new/process: markdown/** markdown/*/** mkdocs.yml - rm -rf html-new - mkdir html-new - rm -rf doc-build - mkdir doc-build +process-md: markdown/** process-md.sh dirs rsync -a --delete markdown/. doc-build/. ./process-md.sh -html-new/index.html: html-new/process - mkdocs build +dirs: html-new doc-build + mkdir -p html-new + mkdir -p doc-build pdns-expanded.html: pdns-expanded.xml xmlto xhtml-nochunks -m config.xsl $< diff --git a/pdns/docs/markdown/authoritative/backend-bind.md b/pdns/docs/markdown/authoritative/backend-bind.md index 4b9b6ad10a..fae4e0e6e0 100644 --- a/pdns/docs/markdown/authoritative/backend-bind.md +++ b/pdns/docs/markdown/authoritative/backend-bind.md @@ -1,6 +1,6 @@ # Bind zone file backend -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes| diff --git a/pdns/docs/markdown/authoritative/backend-db2.md b/pdns/docs/markdown/authoritative/backend-db2.md index ddd7400fac..355decabfc 100644 --- a/pdns/docs/markdown/authoritative/backend-db2.md +++ b/pdns/docs/markdown/authoritative/backend-db2.md @@ -1,7 +1,7 @@ # DB2 Backend **Note**: This backend is unsupported. -| | | +| | | |:--|:--| |Native|Yes| |Master|No| diff --git a/pdns/docs/markdown/authoritative/backend-deprecated.md b/pdns/docs/markdown/authoritative/backend-deprecated.md index 458526e573..945fa9e2bb 100644 --- a/pdns/docs/markdown/authoritative/backend-deprecated.md +++ b/pdns/docs/markdown/authoritative/backend-deprecated.md @@ -3,7 +3,7 @@ This page contains some information about deprecated backends. # ODBC backend **Note**: This backend was removed in version 3.1. -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes (experimental)| diff --git a/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md b/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md index ec4f230ea3..c48870ed74 100644 --- a/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md +++ b/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md @@ -1,5 +1,5 @@ # Generic MySQL and PgSQL backends -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes| diff --git a/pdns/docs/markdown/authoritative/backend-geo.md b/pdns/docs/markdown/authoritative/backend-geo.md index b8e7920d9d..eb095e69eb 100644 --- a/pdns/docs/markdown/authoritative/backend-geo.md +++ b/pdns/docs/markdown/authoritative/backend-geo.md @@ -3,7 +3,7 @@ The main author for this module is Mark Bergsma. -| | | +| | | |:--|:--| |Native|Partial| |Master|No| diff --git a/pdns/docs/markdown/authoritative/backend-gsqlite.md b/pdns/docs/markdown/authoritative/backend-gsqlite.md index a7e249c6d5..36ce31bd3e 100644 --- a/pdns/docs/markdown/authoritative/backend-gsqlite.md +++ b/pdns/docs/markdown/authoritative/backend-gsqlite.md @@ -1,5 +1,5 @@ # Generic SQLite backend (2 and 3) -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes| diff --git a/pdns/docs/markdown/authoritative/backend-ldap.md b/pdns/docs/markdown/authoritative/backend-ldap.md index 28c9d39c1a..89bed30b69 100644 --- a/pdns/docs/markdown/authoritative/backend-ldap.md +++ b/pdns/docs/markdown/authoritative/backend-ldap.md @@ -11,7 +11,7 @@ He also maintains the [LDAP backends documentation](http://wiki.linuxnetworks.de **Warning**: Host names and the MNAME of a SOA records are NEVER terminated with a '.' in PowerDNS storage! If a trailing '.' is present it will inevitably cause problems, problems that may be hard to debug. -| | | +| | | |:--|:--| |Native|Yes| |Master|No| diff --git a/pdns/docs/markdown/authoritative/backend-lmdb.md b/pdns/docs/markdown/authoritative/backend-lmdb.md index 9d4fcf1eab..b67dcfeeee 100644 --- a/pdns/docs/markdown/authoritative/backend-lmdb.md +++ b/pdns/docs/markdown/authoritative/backend-lmdb.md @@ -1,5 +1,5 @@ # LMDB (high performance) backend -| | | +| | | |:--|:--| |Native|Yes| |Master|No| diff --git a/pdns/docs/markdown/authoritative/backend-oracle.md b/pdns/docs/markdown/authoritative/backend-oracle.md index ed9d1c269d..7294cc4ed6 100644 --- a/pdns/docs/markdown/authoritative/backend-oracle.md +++ b/pdns/docs/markdown/authoritative/backend-oracle.md @@ -1,5 +1,5 @@ # Oracle backend -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes| diff --git a/pdns/docs/markdown/authoritative/backend-pipe.md b/pdns/docs/markdown/authoritative/backend-pipe.md index 0e7fa12459..cb010d1f51 100644 --- a/pdns/docs/markdown/authoritative/backend-pipe.md +++ b/pdns/docs/markdown/authoritative/backend-pipe.md @@ -1,5 +1,5 @@ # Pipe Backend -| | | +| | | |:--|:--| |Native|Yes| |Master|No| @@ -19,7 +19,7 @@ The PipeBackend is primarily meant for allowing rapid development of new backend ## Configuration Parameters ### `pipe-command` -| | | +| | | |:-|:-| |Type|String| |Mandatory|Yes| @@ -27,7 +27,7 @@ The PipeBackend is primarily meant for allowing rapid development of new backend Command to launch as backend or the path to a unix domain socket file. The socket should already be open and listening before pdns starts. Using the socket is supported since PowerDNS 3.3. ### `pipe-timeout` -| | | +| | | |:-|:-| |Type|Integer| |Default|2000| @@ -35,7 +35,7 @@ Command to launch as backend or the path to a unix domain socket file. The socke Number of milliseconds to wait for an answer from the backend. If this time is ever exceeded, the backend is declared dead and a new process is spawned. ### `pipe-regex` -| | | +| | | |:-|:-| |Type|String (a regex)| diff --git a/pdns/docs/markdown/authoritative/backend-remote.md b/pdns/docs/markdown/authoritative/backend-remote.md index 2a93251155..2f6c2d672d 100644 --- a/pdns/docs/markdown/authoritative/backend-remote.md +++ b/pdns/docs/markdown/authoritative/backend-remote.md @@ -1,7 +1,7 @@ # Remote Backend **Warning**: The Remote Backend is available since PowerDNS Authoritative Server 3.2. This backend is stable on version 3.3, not before. -| | | +| | | |:--|:--| |Native|Yes| |Master|Yes\*| diff --git a/pdns/docs/markdown/authoritative/settings.md b/pdns/docs/markdown/authoritative/settings.md index 25d9ba3105..0fb538146a 100644 --- a/pdns/docs/markdown/authoritative/settings.md +++ b/pdns/docs/markdown/authoritative/settings.md @@ -190,7 +190,7 @@ Allow this many incoming TCP DNS connections simultaneously. Default directory for modules. See ["Modules and Backends"](#XXX). ## `negquery-cache-ttl` -| | | +| | | |:-|:-| |Type|Integer| |Default|60| @@ -225,7 +225,7 @@ ABI version to use for the pipe backend. See ["PipeBackend protocol"](backend-pi Boolean, available as of 3.3. PowerDNS Authoritative Server attempts to not send out notifications to itself in master mode. In very complicated situations we could guess wrong and not notify a server that should be notified. In that case, set prevent-self-notification to "no". ## `query-cache-ttl` -| | | +| | | |:-|:-| |Type|Integer| |Default|20| diff --git a/pdns/docs/process-md.sh b/pdns/docs/process-md.sh index 73d036c496..5494d8c41c 100755 --- a/pdns/docs/process-md.sh +++ b/pdns/docs/process-md.sh @@ -1,5 +1,5 @@ #!/bin/sh for file in `find doc-build -name '*.md' -type f -print`; do - pandoc -f markdown_github -t markdown_mmd -F markdown/process-includes.py $file -o $file + pandoc -f markdown_github+pipe_tables -t markdown_github+pipe_tables -F markdown/process-includes.py $file -o $file done