README.html: Web page management changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 87ad60f40d178da03ad826f4ccecc66cfb41ca04..182dc1338b99941b133e9e9bf2ad9238920abfe5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ adnshost.txt: all
 
 web-install: adnshost.txt
        test -e $(WEBDIR) || mkdir $(WEBDIR)
 
 web-install: adnshost.txt
        test -e $(WEBDIR) || mkdir $(WEBDIR)

-       $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/index.html
+       $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/

        $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
        $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
        $(INSTALL_DATA) adnshost.txt $(WEBDIR)/
        $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
        $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
        $(INSTALL_DATA) adnshost.txt $(WEBDIR)/

diff --git a/README b/README
index 97a38ee9c5a1b297ee0b038b04831204bd9e43d1..b5ba96d758e40f77c2ec88b9afc7ae866ccd8312 100644 (file)
--- a/README
+++ b/README
@@ -95,7 +95,8 @@ Documentation
 Download and source code
 
      * The [7]current release as a gzipped tarfile.
 Download and source code
 
      * The [7]current release as a gzipped tarfile.

-     * [8]Previous versions.
+     * [8]Previous versions and other files (including OpenPGP
+       signatures).

      * [9]master git (version control) repository browser.
 
    adns is also available from the [10]GNU Project FTP servers and their
      * [9]master git (version control) repository browser.
 
    adns is also available from the [10]GNU Project FTP servers and their


@@ -103,9 +104,9 @@ Download and source code
 
 Installation note
 
 
 Installation note
 

-   adns requires a real nameserver like [12]BIND running on the same
-   system or a nearby one, which must be willing to provide `recursive
-   service'. I.e., adns is a `stub resolver'.
+   adns requires a real nameserver like BIND running on the same system or
+   a nearby one, which must be willing to provide `recursive service'.
+   I.e., adns is a `stub resolver'.

 
    adns requires that your real nameserver is on the same machine, or
    connected via a secure network, so that an attacker cannot fake the
 
    adns requires that your real nameserver is on the same machine, or
    connected via a secure network, so that an attacker cannot fake the


@@ -113,9 +114,9 @@ Installation note
 
 References and related projects
 
 
 References and related projects
 

-     * [13]Python bindings by Andy Dustman.
-     * [14]liboop event loop library has a built-in binding for adns.
-     * [15]port to MS Visual Studio 6 C++ by Jarle Aase.
+     * [12]Python bindings by Andy Dustman.
+     * [13]liboop event loop library has a built-in binding for adns.
+     * [14]port to MS Visual Studio 6 C++ by Jarle Aase.

 
 Copyright and licensing
 
 
 Copyright and licensing
 


@@ -130,41 +131,40 @@ Copyright and licensing
 
    This program and documentation is distributed in the hope that it will
    be useful, but without any warranty; without even the implied warranty
 
    This program and documentation is distributed in the hope that it will
    be useful, but without any warranty; without even the implied warranty

-   of merchantability or fitness for a particular purpose. See the [16]GNU
+   of merchantability or fitness for a particular purpose. See the [15]GNU

    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
    with adns, or one should be available above; if not, write to the
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License along
    with adns, or one should be available above; if not, write to the

-   [17]Free Software Foundation or email ijackson@chiark.greenend.org.uk.
+   [16]Free Software Foundation or email ijackson@chiark.greenend.org.uk.

      __________________________________________________________________
 
    Ian Jackson / ijackson@chiark.greenend.org.uk.
 
      __________________________________________________________________
 
    Ian Jackson / ijackson@chiark.greenend.org.uk.
 

-   [18]GNU home page; [19]chiark home page; [20]site or mirror home page
+   [17]GNU home page; [18]chiark home page; [19]site or mirror home page

 
    This web page is Copyright (C)1996-2005,2014 Ian Jackson. See the
 
    This web page is Copyright (C)1996-2005,2014 Ian Jackson. See the

-   [21]Copyright/acknowledgements.
+   [20]Copyright/acknowledgements.

 
 References
 
 
 References
 

-   1. http://www.chiark.greenend.org.uk/~ian/adns/adnshost.txt
-   2. http://www.chiark.greenend.org.uk/~ian/adns/adns.h.txt
+   1. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
+   2. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt

    3. http://debbugs.gnu.org/
    4. http://www.chiark.greenend.org.uk/mailman/listinfo
    3. http://debbugs.gnu.org/
    4. http://www.chiark.greenend.org.uk/mailman/listinfo

-   5. http://www.chiark.greenend.org.uk/~ian/adns/adns.h.txt
-   6. http://www.chiark.greenend.org.uk/~ian/adns/adnshost.txt
+   5. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
+   6. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt

    7. http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
    8. http://www.chiark.greenend.org.uk/~ian/adns/ftp/
    9. http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
   10. http://www.gnu.org/
   11. http://www.gnu.org/order/ftp.html
    7. http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
    8. http://www.chiark.greenend.org.uk/~ian/adns/ftp/
    9. http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
   10. http://www.gnu.org/
   11. http://www.gnu.org/order/ftp.html

-  12. http://www.isc.org/view.cgi?/products/BIND/index.phtml
-  13. http://code.google.com/p/adns-python
-  14. http://www.lysator.liu.se/liboop/
-  15. http://adns.jgaa.com/
-  16. http://www.chiark.greenend.org.uk/~ian/COPYING.txt
-  17. http://www.fsf.org/
-  18. http://www.gnu.org/
-  19. http://www.chiark.greenend.org.uk/
-  20. file://localhost/
-  21. http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html
+  12. http://code.google.com/p/adns-python
+  13. http://www.lysator.liu.se/liboop/
+  14. http://adns.jgaa.com/
+  15. http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt
+  16. http://www.fsf.org/
+  17. http://www.gnu.org/
+  18. http://www.chiark.greenend.org.uk/
+  19. file://localhost/
+  20. http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html

diff --git a/README.html b/README.html
index 575be8a903bf345a207608b29126fcc4a82d8694..d5bcf909fb14292da50a6367dd5c2cac1e3b898b 100644 (file)
--- a/README.html
+++ b/README.html
@@ -88,7 +88,7 @@ which can be used easily in from the command line and from shell
 scripts to do simple lookups.  In a more advanced mode it can be used
 as a general-purpose DNS helper program for scripting languages which
 can invoke and communicate with subprocesses.  See the
 scripts to do simple lookups.  In a more advanced mode it can be used
 as a general-purpose DNS helper program for scripting languages which
 can invoke and communicate with subprocesses.  See the

-<A href="adnshost.txt">adnshost
+<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">adnshost

 usage message</A> for a summary of its capabilities.
 
 </ul>
 usage message</A> for a summary of its capabilities.
 
 </ul>


@@ -97,7 +97,7 @@ usage message</A> for a summary of its capabilities.
 
 I'm afraid there is no manual yet.  However, competent C programmers
 should be able to use the library based on the
 
 I'm afraid there is no manual yet.  However, competent C programmers
 should be able to use the library based on the

-<A href="adns.h.txt">commented
+<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">commented

 adns.h header file</A>, and the usage messages for the programs should
 be sufficient.
 
 adns.h header file</A>, and the usage messages for the programs should
 be sufficient.
 


@@ -141,9 +141,9 @@ containing the word `subscribe' to
 <h2>Documentation</h2>
 
 <ul>
 <h2>Documentation</h2>
 
 <ul>

-<li><A href="adns.h.txt">adns.h
+<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">adns.h

     API header file with documentation comments</A>
     API header file with documentation comments</A>

-<li><A href="adnshost.txt">usage
+<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">usage

     message for adnshost</A>
 </ul>
 
     message for adnshost</A>
 </ul>
 


@@ -205,7 +205,7 @@ This program and documentation is distributed in the hope that it will
 be useful, but <em>without any warranty</em>; without even the implied
 warranty of <em>merchantability</em> or <em>fitness for a particular
 purpose</em>.  See the
 be useful, but <em>without any warranty</em>; without even the implied
 warranty of <em>merchantability</em> or <em>fitness for a particular
 purpose</em>.  See the

-<A href="COPYING.txt">GNU
+<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt">GNU

 General Public License</A> for more details.
 
 <p>
 General Public License</A> for more details.
 
 <p>