From: Pieter Lexis Date: Tue, 2 Dec 2014 07:45:53 +0000 (+0100) Subject: Move the /pdns/docs folder to /docs X-Git-Tag: rec-3.7.0-rc1~67^2~19^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=215573184347f77fbfe6611e94f89a53a20cdce5;p=pdns Move the /pdns/docs folder to /docs --- diff --git a/Makefile.am b/Makefile.am index 38fd09771..4a09c632b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = modules codedocs pdns/docs +SUBDIRS = modules codedocs docs if WITH_PDNS_SERVER SUBDIRS += pdns diff --git a/configure.ac b/configure.ac index 29894fbf8..5e4bc0b43 100644 --- a/configure.ac +++ b/configure.ac @@ -338,8 +338,8 @@ AC_CONFIG_FILES([ modules/Makefile pdns/Makefile codedocs/Makefile + docs/Makefile pdns/pdns.init - pdns/docs/Makefile pdns/ext/Makefile pdns/ext/yahttp/Makefile pdns/ext/yahttp/yahttp/Makefile diff --git a/debian/rules b/debian/rules index 127f2f7dd..cb66c0544 100755 --- a/debian/rules +++ b/debian/rules @@ -106,7 +106,7 @@ binary-static: stamp-build-static binary-main-prepare clean: -make distclean - -make -C pdns/docs clean + -make -C docs clean rm -f debian/files debian/substvars stamp-build stamp-build-static rm -rf "$(tmpdir)" diff --git a/pdns/docs/.gitignore b/docs/.gitignore similarity index 100% rename from pdns/docs/.gitignore rename to docs/.gitignore diff --git a/pdns/docs/Dockerfile b/docs/Dockerfile similarity index 100% rename from pdns/docs/Dockerfile rename to docs/Dockerfile diff --git a/pdns/docs/Makefile.am b/docs/Makefile.am similarity index 100% rename from pdns/docs/Makefile.am rename to docs/Makefile.am diff --git a/pdns/docs/WIP/.gitkeep b/docs/WIP/.gitkeep similarity index 100% rename from pdns/docs/WIP/.gitkeep rename to docs/WIP/.gitkeep diff --git a/pdns/docs/WIP/alias.md b/docs/WIP/alias.md similarity index 100% rename from pdns/docs/WIP/alias.md rename to docs/WIP/alias.md diff --git a/pdns/docs/WIP/web-api.md b/docs/WIP/web-api.md similarity index 100% rename from pdns/docs/WIP/web-api.md rename to docs/WIP/web-api.md diff --git a/pdns/docs/extract.cc b/docs/extract.cc similarity index 100% rename from pdns/docs/extract.cc rename to docs/extract.cc diff --git a/pdns/docs/make-thanks b/docs/make-thanks similarity index 100% rename from pdns/docs/make-thanks rename to docs/make-thanks diff --git a/pdns/docs/manpages/dnsdist.1.md b/docs/manpages/dnsdist.1.md similarity index 100% rename from pdns/docs/manpages/dnsdist.1.md rename to docs/manpages/dnsdist.1.md diff --git a/pdns/docs/manpages/dnsreplay.1.md b/docs/manpages/dnsreplay.1.md similarity index 100% rename from pdns/docs/manpages/dnsreplay.1.md rename to docs/manpages/dnsreplay.1.md diff --git a/pdns/docs/manpages/dnsscope.1.md b/docs/manpages/dnsscope.1.md similarity index 100% rename from pdns/docs/manpages/dnsscope.1.md rename to docs/manpages/dnsscope.1.md diff --git a/pdns/docs/manpages/dnstcpbench.1.md b/docs/manpages/dnstcpbench.1.md similarity index 100% rename from pdns/docs/manpages/dnstcpbench.1.md rename to docs/manpages/dnstcpbench.1.md diff --git a/pdns/docs/manpages/dnswasher.1.md b/docs/manpages/dnswasher.1.md similarity index 100% rename from pdns/docs/manpages/dnswasher.1.md rename to docs/manpages/dnswasher.1.md diff --git a/pdns/docs/manpages/pdns_control.1.md b/docs/manpages/pdns_control.1.md similarity index 100% rename from pdns/docs/manpages/pdns_control.1.md rename to docs/manpages/pdns_control.1.md diff --git a/pdns/docs/manpages/pdns_recursor.1.md b/docs/manpages/pdns_recursor.1.md similarity index 100% rename from pdns/docs/manpages/pdns_recursor.1.md rename to docs/manpages/pdns_recursor.1.md diff --git a/pdns/docs/manpages/pdns_server.1.md b/docs/manpages/pdns_server.1.md similarity index 100% rename from pdns/docs/manpages/pdns_server.1.md rename to docs/manpages/pdns_server.1.md diff --git a/pdns/docs/manpages/pdnssec.1.md b/docs/manpages/pdnssec.1.md similarity index 100% rename from pdns/docs/manpages/pdnssec.1.md rename to docs/manpages/pdnssec.1.md diff --git a/pdns/docs/manpages/rec_control.1.md b/docs/manpages/rec_control.1.md similarity index 100% rename from pdns/docs/manpages/rec_control.1.md rename to docs/manpages/rec_control.1.md diff --git a/pdns/docs/manpages/zone2ldap.1.md b/docs/manpages/zone2ldap.1.md similarity index 100% rename from pdns/docs/manpages/zone2ldap.1.md rename to docs/manpages/zone2ldap.1.md diff --git a/pdns/docs/manpages/zone2sql.1.md b/docs/manpages/zone2sql.1.md similarity index 100% rename from pdns/docs/manpages/zone2sql.1.md rename to docs/manpages/zone2sql.1.md diff --git a/pdns/docs/markdown/appendix/backend-writers-guide.md b/docs/markdown/appendix/backend-writers-guide.md similarity index 100% rename from pdns/docs/markdown/appendix/backend-writers-guide.md rename to docs/markdown/appendix/backend-writers-guide.md diff --git a/pdns/docs/markdown/appendix/compiling-powerdns.md b/docs/markdown/appendix/compiling-powerdns.md similarity index 100% rename from pdns/docs/markdown/appendix/compiling-powerdns.md rename to docs/markdown/appendix/compiling-powerdns.md diff --git a/pdns/docs/markdown/appendix/crypto-notes-export.md b/docs/markdown/appendix/crypto-notes-export.md similarity index 100% rename from pdns/docs/markdown/appendix/crypto-notes-export.md rename to docs/markdown/appendix/crypto-notes-export.md diff --git a/pdns/docs/markdown/appendix/documentation.md b/docs/markdown/appendix/documentation.md similarity index 81% rename from pdns/docs/markdown/appendix/documentation.md rename to docs/markdown/appendix/documentation.md index 26fdf171c..08f7b37f9 100644 --- a/pdns/docs/markdown/appendix/documentation.md +++ b/docs/markdown/appendix/documentation.md @@ -4,7 +4,7 @@ Pieter Lexis contributed a Markdown conversion, which is the basis of the curren If you note an issue with the new documentation, please open a ticket on [GitHub](https://github.com/powerdns/pdns/issues) and tell us about it. Or, even -better, fork our repo, and edit the files in pdns/docs/markdown to improve things. +better, fork our repo, and edit the files in docs/markdown to improve things. If your change is simple (say, a typo or a new paragraph), you can do all this entirely from GitHub. Simply fork PowerDNS, find the Markdown file you want to change, @@ -16,11 +16,10 @@ with the required packages to build the documentation. [Virtualenvwrapper](http://virtualenvwrapper.readthedocs.org/en/latest/) can be used to easily create and use a virtualenv. -Once you're in a virtualenv, `pip install mkdocs==0.11.1 pandocfilters==1.2.3 -pandoc==1.0.0-alpha.3`. +Once you're in a virtualenv, `pip install mkdocs==0.11.1 pandocfilters==1.2.3`. -To test-build the documentation, `make html-new/index.html` in the pdns/docs -directory will build the documentation into `html-new/`. +To test-build the documentation, `make html/index.html` in the docs +directory will build the documentation into `html/`. To test your changes live, use `mkdocs serve --dev-addr=0.0.0.0:8000`, and the new version of your documentation will appear on port 8000 of your machine. diff --git a/pdns/docs/markdown/authoritative/backend-bind.md b/docs/markdown/authoritative/backend-bind.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-bind.md rename to docs/markdown/authoritative/backend-bind.md diff --git a/pdns/docs/markdown/authoritative/backend-deprecated.md b/docs/markdown/authoritative/backend-deprecated.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-deprecated.md rename to docs/markdown/authoritative/backend-deprecated.md diff --git a/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md b/docs/markdown/authoritative/backend-generic-mypgsql.md similarity index 99% rename from pdns/docs/markdown/authoritative/backend-generic-mypgsql.md rename to docs/markdown/authoritative/backend-generic-mypgsql.md index fcd17f554..e518fe55e 100644 --- a/pdns/docs/markdown/authoritative/backend-generic-mypgsql.md +++ b/docs/markdown/authoritative/backend-generic-mypgsql.md @@ -31,7 +31,7 @@ In practice, great results are achieved with the 'InnoDB' tables. PowerDNS will The default setup conforms to the following schema: ``` -!!include=../../modules/gmysqlbackend/schema.mysql.sql +!!include=../modules/gmysqlbackend/schema.mysql.sql ``` `zone2sql` with the `--gmysql` flag also assumes this layout is in place. @@ -61,7 +61,7 @@ This automates deletion of records on deletion of a domain from the domains tabl The default setup conforms to the following schema, which you should add to a PostgreSQL database. ``` -!!include=../../modules/gpgsqlbackend/schema.pgsql.sql +!!include=../modules/gpgsqlbackend/schema.pgsql.sql ``` `zone2sql` with the `--gpgsql` flag also assumes this layout is in place. @@ -76,7 +76,7 @@ With PostgreSQL, you may have to run `createdb powerdns` first and then connect Generic Oracle support is only available since version 2.9.18. The default setup conforms to the following schema, which you should add to an Oracle database. You may need or want to add `namespace` statements. ``` -!!include=../../modules/gpgsqlbackend/schema.pgsql.sql +!!include=../modules/gpgsqlbackend/schema.pgsql.sql ``` This schema contains all elements needed for master, slave and superslave operation. diff --git a/pdns/docs/markdown/authoritative/backend-geo.md b/docs/markdown/authoritative/backend-geo.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-geo.md rename to docs/markdown/authoritative/backend-geo.md diff --git a/pdns/docs/markdown/authoritative/backend-geoip.md b/docs/markdown/authoritative/backend-geoip.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-geoip.md rename to docs/markdown/authoritative/backend-geoip.md diff --git a/pdns/docs/markdown/authoritative/backend-gsqlite.md b/docs/markdown/authoritative/backend-gsqlite.md similarity index 98% rename from pdns/docs/markdown/authoritative/backend-gsqlite.md rename to docs/markdown/authoritative/backend-gsqlite.md index 17cd7713d..015d3e6c7 100644 --- a/pdns/docs/markdown/authoritative/backend-gsqlite.md +++ b/docs/markdown/authoritative/backend-gsqlite.md @@ -30,7 +30,7 @@ SQLite is included in most PowerDNS binary releases. Before you can use this backend you first have to set it up and fill it with data. The default setup conforms to the following schema: ``` -!!include=../../modules/gsqlite3backend/schema.sqlite3.sql +!!include=../modules/gsqlite3backend/schema.sqlite3.sql ``` This schema contains all elements needed for master, slave and superslave operation. diff --git a/pdns/docs/markdown/authoritative/backend-ldap.md b/docs/markdown/authoritative/backend-ldap.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-ldap.md rename to docs/markdown/authoritative/backend-ldap.md diff --git a/pdns/docs/markdown/authoritative/backend-lmdb.md b/docs/markdown/authoritative/backend-lmdb.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-lmdb.md rename to docs/markdown/authoritative/backend-lmdb.md diff --git a/pdns/docs/markdown/authoritative/backend-lua.md b/docs/markdown/authoritative/backend-lua.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-lua.md rename to docs/markdown/authoritative/backend-lua.md diff --git a/pdns/docs/markdown/authoritative/backend-oracle.md b/docs/markdown/authoritative/backend-oracle.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-oracle.md rename to docs/markdown/authoritative/backend-oracle.md diff --git a/pdns/docs/markdown/authoritative/backend-pipe.md b/docs/markdown/authoritative/backend-pipe.md similarity index 99% rename from pdns/docs/markdown/authoritative/backend-pipe.md rename to docs/markdown/authoritative/backend-pipe.md index 3933337f0..893f3d05f 100644 --- a/pdns/docs/markdown/authoritative/backend-pipe.md +++ b/docs/markdown/authoritative/backend-pipe.md @@ -172,5 +172,5 @@ For api-versions 1 and 2, the two new fields fall back to default values. The de ## Sample perl backend ``` -!!include=../../modules/pipebackend/backend.pl +!!include=../modules/pipebackend/backend.pl ``` diff --git a/pdns/docs/markdown/authoritative/backend-random.md b/docs/markdown/authoritative/backend-random.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-random.md rename to docs/markdown/authoritative/backend-random.md diff --git a/pdns/docs/markdown/authoritative/backend-remote.md b/docs/markdown/authoritative/backend-remote.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-remote.md rename to docs/markdown/authoritative/backend-remote.md diff --git a/pdns/docs/markdown/authoritative/backend-tinydns.md b/docs/markdown/authoritative/backend-tinydns.md similarity index 100% rename from pdns/docs/markdown/authoritative/backend-tinydns.md rename to docs/markdown/authoritative/backend-tinydns.md diff --git a/pdns/docs/markdown/authoritative/dnssec.md b/docs/markdown/authoritative/dnssec.md similarity index 100% rename from pdns/docs/markdown/authoritative/dnssec.md rename to docs/markdown/authoritative/dnssec.md diff --git a/pdns/docs/markdown/authoritative/dnsupdate.md b/docs/markdown/authoritative/dnsupdate.md similarity index 100% rename from pdns/docs/markdown/authoritative/dnsupdate.md rename to docs/markdown/authoritative/dnsupdate.md diff --git a/pdns/docs/markdown/authoritative/domainmetadata.md b/docs/markdown/authoritative/domainmetadata.md similarity index 100% rename from pdns/docs/markdown/authoritative/domainmetadata.md rename to docs/markdown/authoritative/domainmetadata.md diff --git a/pdns/docs/markdown/authoritative/index.md b/docs/markdown/authoritative/index.md similarity index 100% rename from pdns/docs/markdown/authoritative/index.md rename to docs/markdown/authoritative/index.md diff --git a/pdns/docs/markdown/authoritative/installation.md b/docs/markdown/authoritative/installation.md similarity index 99% rename from pdns/docs/markdown/authoritative/installation.md rename to docs/markdown/authoritative/installation.md index 8bb48222a..36f8f3f05 100644 --- a/pdns/docs/markdown/authoritative/installation.md +++ b/docs/markdown/authoritative/installation.md @@ -97,7 +97,7 @@ General MySQL knowledge is assumed in this chapter, please do not interpret thes Connect to MySQL as a user with sufficient privileges and issue the following commands: ``` -!!include=../../modules/gmysqlbackend/schema.mysql.sql +!!include=../modules/gmysqlbackend/schema.mysql.sql ``` Now we have a database and an empty table. PDNS should now be able to launch in monitor mode and display no errors: diff --git a/pdns/docs/markdown/authoritative/internals.md b/docs/markdown/authoritative/internals.md similarity index 100% rename from pdns/docs/markdown/authoritative/internals.md rename to docs/markdown/authoritative/internals.md diff --git a/pdns/docs/markdown/authoritative/migration.md b/docs/markdown/authoritative/migration.md similarity index 100% rename from pdns/docs/markdown/authoritative/migration.md rename to docs/markdown/authoritative/migration.md diff --git a/pdns/docs/markdown/authoritative/modes-of-operation.md b/docs/markdown/authoritative/modes-of-operation.md similarity index 100% rename from pdns/docs/markdown/authoritative/modes-of-operation.md rename to docs/markdown/authoritative/modes-of-operation.md diff --git a/pdns/docs/markdown/authoritative/performance.md b/docs/markdown/authoritative/performance.md similarity index 100% rename from pdns/docs/markdown/authoritative/performance.md rename to docs/markdown/authoritative/performance.md diff --git a/pdns/docs/markdown/authoritative/recursion.md b/docs/markdown/authoritative/recursion.md similarity index 100% rename from pdns/docs/markdown/authoritative/recursion.md rename to docs/markdown/authoritative/recursion.md diff --git a/pdns/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md similarity index 100% rename from pdns/docs/markdown/authoritative/settings.md rename to docs/markdown/authoritative/settings.md diff --git a/pdns/docs/markdown/authoritative/upgrading.md b/docs/markdown/authoritative/upgrading.md similarity index 96% rename from pdns/docs/markdown/authoritative/upgrading.md rename to docs/markdown/authoritative/upgrading.md index f0b7f2f53..9a22c6ac6 100644 --- a/pdns/docs/markdown/authoritative/upgrading.md +++ b/docs/markdown/authoritative/upgrading.md @@ -13,37 +13,37 @@ If custom queries are in use, they probably need an update. ### gmysql backend with nodnssec schema ``` -!!include=../../modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql +!!include=../modules/gmysqlbackend/nodnssec-3.x_to_3.4.0_schema.mysql.sql ``` ### gmysql backend with dnssec schema ``` -!!include=../../modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql +!!include=../modules/gmysqlbackend/dnssec-3.x_to_3.4.0_schema.mysql.sql ``` ### gpgsql backend with nodnssec schema ``` -!!include=../../modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql +!!include=../modules/gpgsqlbackend/nodnssec-3.x_to_3.4.0_schema.pgsql.sql ``` ### gpgsql backend with dnssec schema: ``` -!!include=../../modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql +!!include=../modules/gpgsqlbackend/dnssec-3.x_to_3.4.0_schema.pgsql.sql ``` ### gsqlite3 backend with nodnssec schema ``` -!!include=../../modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql +!!include=../modules/gsqlite3backend/nodnssec-3.x_to_3.4.0_schema.sqlite3.sql ``` ### gsqlite3 backend with dnssec schema: ``` -!!include=../../modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql +!!include=../modules/gsqlite3backend/dnssec-3.x_to_3.4.0_schema.sqlite3.sql ``` ### goracle backend: diff --git a/pdns/docs/markdown/authoritative/virtual.md b/docs/markdown/authoritative/virtual.md similarity index 100% rename from pdns/docs/markdown/authoritative/virtual.md rename to docs/markdown/authoritative/virtual.md diff --git a/pdns/docs/markdown/changelog.md b/docs/markdown/changelog.md similarity index 100% rename from pdns/docs/markdown/changelog.md rename to docs/markdown/changelog.md diff --git a/pdns/docs/markdown/common/logging.md b/docs/markdown/common/logging.md similarity index 100% rename from pdns/docs/markdown/common/logging.md rename to docs/markdown/common/logging.md diff --git a/pdns/docs/markdown/common/security.md b/docs/markdown/common/security.md similarity index 99% rename from pdns/docs/markdown/common/security.md rename to docs/markdown/common/security.md index 96f13f3cd..90a19862a 100644 --- a/pdns/docs/markdown/common/security.md +++ b/docs/markdown/common/security.md @@ -37,7 +37,7 @@ As of Authoritative Server 3.4.1 and Recursor 3.6.2, PowerDNS products can poll By default, security polling happens on the domain 'secpoll.powerdns.com', but this can be changed with the security-poll-suffix. If this setting is made empty, no polling will take place. Organizations wanting to host their own security zones can do so by changing this setting to a domain name under their control. -To make this easier, the zone used to host secpoll.powerdns.com is available [here](https://github.com/PowerDNS/pdns/blob/master/pdns/docs/secpoll.zone). +To make this easier, the zone used to host secpoll.powerdns.com is available [here](https://github.com/PowerDNS/pdns/blob/master/docs/secpoll.zone). To enable distributors of PowerDNS to signal that they have backported versions, the PACKAGEVERSION compilation-time macro can be used to set a distributor suffix. diff --git a/pdns/docs/markdown/common/support.md b/docs/markdown/common/support.md similarity index 100% rename from pdns/docs/markdown/common/support.md rename to docs/markdown/common/support.md diff --git a/pdns/docs/markdown/httpapi/README.md b/docs/markdown/httpapi/README.md similarity index 100% rename from pdns/docs/markdown/httpapi/README.md rename to docs/markdown/httpapi/README.md diff --git a/pdns/docs/markdown/httpapi/api_spec.md b/docs/markdown/httpapi/api_spec.md similarity index 100% rename from pdns/docs/markdown/httpapi/api_spec.md rename to docs/markdown/httpapi/api_spec.md diff --git a/pdns/docs/markdown/httpapi/features.md b/docs/markdown/httpapi/features.md similarity index 100% rename from pdns/docs/markdown/httpapi/features.md rename to docs/markdown/httpapi/features.md diff --git a/pdns/docs/markdown/httpapi/intro.md b/docs/markdown/httpapi/intro.md similarity index 100% rename from pdns/docs/markdown/httpapi/intro.md rename to docs/markdown/httpapi/intro.md diff --git a/pdns/docs/markdown/index.md b/docs/markdown/index.md similarity index 100% rename from pdns/docs/markdown/index.md rename to docs/markdown/index.md diff --git a/pdns/docs/markdown/process-includes.py b/docs/markdown/process-includes.py similarity index 100% rename from pdns/docs/markdown/process-includes.py rename to docs/markdown/process-includes.py diff --git a/pdns/docs/markdown/recursor/dns64.md b/docs/markdown/recursor/dns64.md similarity index 100% rename from pdns/docs/markdown/recursor/dns64.md rename to docs/markdown/recursor/dns64.md diff --git a/pdns/docs/markdown/recursor/index.md b/docs/markdown/recursor/index.md similarity index 100% rename from pdns/docs/markdown/recursor/index.md rename to docs/markdown/recursor/index.md diff --git a/pdns/docs/markdown/recursor/internals.md b/docs/markdown/recursor/internals.md similarity index 100% rename from pdns/docs/markdown/recursor/internals.md rename to docs/markdown/recursor/internals.md diff --git a/pdns/docs/markdown/recursor/performance.md b/docs/markdown/recursor/performance.md similarity index 100% rename from pdns/docs/markdown/recursor/performance.md rename to docs/markdown/recursor/performance.md diff --git a/pdns/docs/markdown/recursor/running.md b/docs/markdown/recursor/running.md similarity index 100% rename from pdns/docs/markdown/recursor/running.md rename to docs/markdown/recursor/running.md diff --git a/pdns/docs/markdown/recursor/scripting.md b/docs/markdown/recursor/scripting.md similarity index 100% rename from pdns/docs/markdown/recursor/scripting.md rename to docs/markdown/recursor/scripting.md diff --git a/pdns/docs/markdown/recursor/security.md b/docs/markdown/recursor/security.md similarity index 100% rename from pdns/docs/markdown/recursor/security.md rename to docs/markdown/recursor/security.md diff --git a/pdns/docs/markdown/recursor/settings.md b/docs/markdown/recursor/settings.md similarity index 100% rename from pdns/docs/markdown/recursor/settings.md rename to docs/markdown/recursor/settings.md diff --git a/pdns/docs/markdown/recursor/stats.md b/docs/markdown/recursor/stats.md similarity index 100% rename from pdns/docs/markdown/recursor/stats.md rename to docs/markdown/recursor/stats.md diff --git a/pdns/docs/markdown/security/index.md b/docs/markdown/security/index.md similarity index 100% rename from pdns/docs/markdown/security/index.md rename to docs/markdown/security/index.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2006-01.md b/docs/markdown/security/powerdns-advisory-2006-01.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2006-01.md rename to docs/markdown/security/powerdns-advisory-2006-01.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2006-02.md b/docs/markdown/security/powerdns-advisory-2006-02.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2006-02.md rename to docs/markdown/security/powerdns-advisory-2006-02.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2008-01.md b/docs/markdown/security/powerdns-advisory-2008-01.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2008-01.md rename to docs/markdown/security/powerdns-advisory-2008-01.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2008-02.md b/docs/markdown/security/powerdns-advisory-2008-02.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2008-02.md rename to docs/markdown/security/powerdns-advisory-2008-02.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2008-03.md b/docs/markdown/security/powerdns-advisory-2008-03.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2008-03.md rename to docs/markdown/security/powerdns-advisory-2008-03.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2010-01.md b/docs/markdown/security/powerdns-advisory-2010-01.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2010-01.md rename to docs/markdown/security/powerdns-advisory-2010-01.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2010-02.md b/docs/markdown/security/powerdns-advisory-2010-02.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2010-02.md rename to docs/markdown/security/powerdns-advisory-2010-02.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2012-01.md b/docs/markdown/security/powerdns-advisory-2012-01.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2012-01.md rename to docs/markdown/security/powerdns-advisory-2012-01.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2014-01.md b/docs/markdown/security/powerdns-advisory-2014-01.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2014-01.md rename to docs/markdown/security/powerdns-advisory-2014-01.md diff --git a/pdns/docs/markdown/security/powerdns-advisory-2014-02.md b/docs/markdown/security/powerdns-advisory-2014-02.md similarity index 100% rename from pdns/docs/markdown/security/powerdns-advisory-2014-02.md rename to docs/markdown/security/powerdns-advisory-2014-02.md diff --git a/pdns/docs/markdown/theme/base.html b/docs/markdown/theme/base.html similarity index 100% rename from pdns/docs/markdown/theme/base.html rename to docs/markdown/theme/base.html diff --git a/pdns/docs/markdown/theme/content.html b/docs/markdown/theme/content.html similarity index 100% rename from pdns/docs/markdown/theme/content.html rename to docs/markdown/theme/content.html diff --git a/pdns/docs/markdown/theme/css/base.css b/docs/markdown/theme/css/base.css similarity index 100% rename from pdns/docs/markdown/theme/css/base.css rename to docs/markdown/theme/css/base.css diff --git a/pdns/docs/markdown/theme/css/bootstrap-custom.min.css b/docs/markdown/theme/css/bootstrap-custom.min.css similarity index 100% rename from pdns/docs/markdown/theme/css/bootstrap-custom.min.css rename to docs/markdown/theme/css/bootstrap-custom.min.css diff --git a/pdns/docs/markdown/theme/css/font-awesome-4.0.3.css b/docs/markdown/theme/css/font-awesome-4.0.3.css similarity index 100% rename from pdns/docs/markdown/theme/css/font-awesome-4.0.3.css rename to docs/markdown/theme/css/font-awesome-4.0.3.css diff --git a/pdns/docs/markdown/theme/css/prettify-1.0.css b/docs/markdown/theme/css/prettify-1.0.css similarity index 100% rename from pdns/docs/markdown/theme/css/prettify-1.0.css rename to docs/markdown/theme/css/prettify-1.0.css diff --git a/pdns/docs/markdown/theme/fonts/fontawesome-webfont.eot b/docs/markdown/theme/fonts/fontawesome-webfont.eot similarity index 100% rename from pdns/docs/markdown/theme/fonts/fontawesome-webfont.eot rename to docs/markdown/theme/fonts/fontawesome-webfont.eot diff --git a/pdns/docs/markdown/theme/fonts/fontawesome-webfont.svg b/docs/markdown/theme/fonts/fontawesome-webfont.svg similarity index 100% rename from pdns/docs/markdown/theme/fonts/fontawesome-webfont.svg rename to docs/markdown/theme/fonts/fontawesome-webfont.svg diff --git a/pdns/docs/markdown/theme/fonts/fontawesome-webfont.ttf b/docs/markdown/theme/fonts/fontawesome-webfont.ttf similarity index 100% rename from pdns/docs/markdown/theme/fonts/fontawesome-webfont.ttf rename to docs/markdown/theme/fonts/fontawesome-webfont.ttf diff --git a/pdns/docs/markdown/theme/fonts/fontawesome-webfont.woff b/docs/markdown/theme/fonts/fontawesome-webfont.woff similarity index 100% rename from pdns/docs/markdown/theme/fonts/fontawesome-webfont.woff rename to docs/markdown/theme/fonts/fontawesome-webfont.woff diff --git a/pdns/docs/markdown/theme/footer.html b/docs/markdown/theme/footer.html similarity index 100% rename from pdns/docs/markdown/theme/footer.html rename to docs/markdown/theme/footer.html diff --git a/pdns/docs/markdown/theme/img/favicon.ico b/docs/markdown/theme/img/favicon.ico similarity index 100% rename from pdns/docs/markdown/theme/img/favicon.ico rename to docs/markdown/theme/img/favicon.ico diff --git a/pdns/docs/markdown/theme/js/base.js b/docs/markdown/theme/js/base.js similarity index 100% rename from pdns/docs/markdown/theme/js/base.js rename to docs/markdown/theme/js/base.js diff --git a/pdns/docs/markdown/theme/js/bootstrap-3.0.3.min.js b/docs/markdown/theme/js/bootstrap-3.0.3.min.js similarity index 100% rename from pdns/docs/markdown/theme/js/bootstrap-3.0.3.min.js rename to docs/markdown/theme/js/bootstrap-3.0.3.min.js diff --git a/pdns/docs/markdown/theme/js/prettify-1.0.min.js b/docs/markdown/theme/js/prettify-1.0.min.js similarity index 100% rename from pdns/docs/markdown/theme/js/prettify-1.0.min.js rename to docs/markdown/theme/js/prettify-1.0.min.js diff --git a/pdns/docs/markdown/theme/nav.html b/docs/markdown/theme/nav.html similarity index 100% rename from pdns/docs/markdown/theme/nav.html rename to docs/markdown/theme/nav.html diff --git a/pdns/docs/markdown/theme/toc.html b/docs/markdown/theme/toc.html similarity index 100% rename from pdns/docs/markdown/theme/toc.html rename to docs/markdown/theme/toc.html diff --git a/pdns/docs/markdown/tools/analysis.md b/docs/markdown/tools/analysis.md similarity index 100% rename from pdns/docs/markdown/tools/analysis.md rename to docs/markdown/tools/analysis.md diff --git a/pdns/docs/markdown/types.md b/docs/markdown/types.md similarity index 100% rename from pdns/docs/markdown/types.md rename to docs/markdown/types.md diff --git a/pdns/docs/mkdocs.yml b/docs/mkdocs.yml similarity index 100% rename from pdns/docs/mkdocs.yml rename to docs/mkdocs.yml diff --git a/pdns/docs/process-md.sh b/docs/process-md.sh similarity index 100% rename from pdns/docs/process-md.sh rename to docs/process-md.sh diff --git a/pdns/docs/secpoll.zone b/docs/secpoll.zone similarity index 100% rename from pdns/docs/secpoll.zone rename to docs/secpoll.zone diff --git a/m4/pdns_check_mkdocs.m4 b/m4/pdns_check_mkdocs.m4 index dbea24c2d..f53aed8d4 100644 --- a/m4/pdns_check_mkdocs.m4 +++ b/m4/pdns_check_mkdocs.m4 @@ -1,9 +1,8 @@ AC_DEFUN([PDNS_CHECK_MKDOCS], [ - AC_REQUIRE([AC_PROG_EGREP]) AC_CHECK_PROG([MKDOCS], [mkdocs], [yes], [no]) AS_IF([test "x$MKDOCS" = "xno"], [ - AS_IF([test ! -d "$scrdir/pdns/docs/html" ], + AS_IF([test ! -d "$scrdir/docs/html" ], [AC_MSG_WARN([mkdocs is missing, unable to build documentation.])] ) ]) diff --git a/m4/pdns_check_pandoc.m4 b/m4/pdns_check_pandoc.m4 index d30c54131..bf1b3e2bd 100644 --- a/m4/pdns_check_pandoc.m4 +++ b/m4/pdns_check_pandoc.m4 @@ -1,9 +1,8 @@ AC_DEFUN([PDNS_CHECK_PANDOC], [ AC_CHECK_PROG([PANDOC], [pandoc], [yes], [no]) - AC_REQUIRE([AC_PROG_EGREP]) AS_IF([test "x$PANDOC" = "xno"], [ - AS_IF([test ! -d "$srcdir/pdns/docs/html" -o ! -f "$srcdir/pdns/docs/pdns_server.1"], + AS_IF([test ! -d "$srcdir/docs/html" -o ! -f "$srcdir/docs/pdns_server.1"], [AC_MSG_WARN([pandoc is missing, unable to build documentation and manpages.])] ) ]) diff --git a/pdns/dist-recursor b/pdns/dist-recursor index 4daf2bcc9..517d9ecbc 100755 --- a/pdns/dist-recursor +++ b/pdns/dist-recursor @@ -40,9 +40,6 @@ dnslabeltext.cc json.cc ws-recursor.cc ws-api.cc version.cc dns_random.cc \ responsestats.cc webserver.cc rec-carbon.cc secpoll-recursor.cc" ./mkpubsuffixcc -cd docs -make pdns_recursor.1 rec_control.1 -cd .. DIRNAME=pdns-recursor-$VERSION rm -rf $DIRNAME @@ -70,7 +67,7 @@ mkdir $DIRNAME/rrd cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd cp dnslabeltext.rl $DIRNAME cp pdns-recursor.init.d $DIRNAME -cp docs/pdns_recursor.1 docs/rec_control.1 $DIRNAME +cp ../docs/pdns_recursor.1 ../docs/rec_control.1 $DIRNAME cp configure-recursor $DIRNAME/configure cp powerdns-example-script.lua $DIRNAME mkdir -p $DIRNAME/contrib