Skip to content
  • Tomek Mrugalski's avatar
    [github39] Merge branch 'docbook-upgrade' of https://github.com/andreipavelQ/kea into github39 · 44c78206
    Tomek Mrugalski authored
     - improvements required (__VERSION__ macro omitted)
     - the patch tried to reverse some texts back to 1.1.0 (we're now at 1.3.0)
     - there were many conflicts...
    
    # Conflicts:
    #	doc/guide/admin.xml
    #	doc/guide/ctrl-channel.xml
    #	doc/guide/ddns.xml
    #	doc/guide/dhcp4-srv.xml
    #	doc/guide/dhcp6-srv.xml
    #	doc/guide/install.xml
    #	doc/guide/intro.xml
    #	doc/guide/kea-guide.xml
    #	src/bin/admin/kea-admin.xml
    #	src/bin/agent/kea-ctrl-agent.xml
    #	src/bin/d2/kea-dhcp-ddns.xml
    #	src/bin/dhcp4/kea-dhcp4.xml
    #	src/bin/dhcp6/kea-dhcp6.xml
    #	src/bin/keactrl/keactrl.xml
    #	src/bin/lfc/kea-lfc.xml
    #	src/bin/perfdhcp/perfdhcp.xml
    #	src/bin/shell/kea-shell.xml
    #	src/bin/sockcreator/kea-sockcreator.xml
    44c78206