diff --git a/ANNOUNCE b/ANNOUNCE index 7cd3df0b3..8d08d88b9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -426,8 +426,8 @@ Version 1.5.0beta53 [October 17, 2010] obsolete statement about a custom ltmain.sh Disabled "color-tests" by default in Makefile.am so it will work with automake versions earlier than 1.11.1 - Use document name "libpng.txt" instead of "libpng-version.txt" as it was - prior to libpng-1.2.16beta2, to simplify version differences. + Use document name "libpng-manual.txt" instead of "libpng-.txt" + to simplify version differences. Removed obsolete remarks about setjmp handling from INSTALL. Revised and renamed the typedef in png.h and png.c that was designed to catch library and header mismatch. diff --git a/CHANGES b/CHANGES index 6912f5c27..f2bfeee89 100644 --- a/CHANGES +++ b/CHANGES @@ -3064,8 +3064,8 @@ Version 1.5.0beta53 [October 17, 2010] obsolete statement about a custom ltmain.sh Disabled "color-tests" by default in Makefile.am so it will work with automake versions earlier than 1.11.1 - Use document name "libpng.txt" instead of "libpng-version.txt" as it was - prior to libpng-1.2.16beta2, to simplify version differences. + Use document name "libpng-manual.txt" instead of "libpng-.txt" + to simplify version differences. Removed obsolete remarks about setjmp handling from INSTALL. Revised and renamed the typedef in png.h and png.c that was designed to catch library and header mismatch. diff --git a/INSTALL b/INSTALL index 5a217ab19..353bfff32 100644 --- a/INSTALL +++ b/INSTALL @@ -130,6 +130,6 @@ do that, run "make install" in the zlib directory first if necessary). Some also allow you to run "make test-installed" after you have run "make install". -Further information can be found in the README and libpng.txt +Further information can be found in the README and libpng-manual.txt files, in the individual makefiles, in png.h, and the manual pages libpng.3 and png.5. diff --git a/Makefile.am b/Makefile.am index 76055ec80..26a7d00e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ EXTRA_DIST= \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ $(TESTS) \ - CMakeLists.txt example.c libpng.txt + CMakeLists.txt example.c libpng-manual.txt SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn diff --git a/Makefile.in b/Makefile.in index efcc1b740..696a31748 100644 --- a/Makefile.in +++ b/Makefile.in @@ -344,7 +344,7 @@ EXTRA_DIST = \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ ${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \ $(TESTS) \ - CMakeLists.txt example.c libpng.txt + CMakeLists.txt example.c libpng-manual.txt SCRIPT_CLEANFILES = scripts/*.out scripts/*.chk scripts/pnglibconf.dfn CLEANFILES = dfn.c dfn?.out pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \ diff --git a/README b/README index 66bf656a2..73ef7a1ce 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.0beta53 - October 16, 2010 (shared library 15.0) +README for libpng version 1.5.0beta53 - October 17, 2010 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -58,7 +58,7 @@ on the PNG-implement mailing list and not on material submitted privately to Guy, Andreas, or Glenn. They will forward any good suggestions to the list. -For a detailed description on using libpng, read libpng.txt. For +For a detailed description on using libpng, read libpng-manual.txt. For examples of libpng in a program, see example.c and pngtest.c. For usage information and restrictions (what little they are) on libpng, see png.h. For a description on using zlib (the compression library used by @@ -141,8 +141,8 @@ Files in this distribution: TODO => Things not implemented in the current library Y2KINFO => Statement of Y2K compliance example.c => Example code for using libpng functions - libpng.3 => manual page for libpng (includes libpng.txt) - libpng.txt => Description of libpng and its functions + libpng.3 => manual page for libpng (includes libpng-manual.txt) + libpng-manual.txt => Description of libpng and its functions libpngpf.3 => manual page for libpng's private functions png.5 => manual page for the PNG format png.c => Basic interface functions common to library diff --git a/example.c b/example.c index 1a4180711..1ff53e594 100644 --- a/example.c +++ b/example.c @@ -10,7 +10,7 @@ */ /* This is an example of how to use libpng to read and write PNG files. - * The file libpng.txt is much more verbose then this. If you have not + * The file libpng-manual.txt is much more verbose then this. If you have not * read it, do so first. This was designed to be a starting point of an * implementation. This is not officially part of libpng, is hereby placed * in the public domain, and therefore does not require a copyright notice. diff --git a/png.h b/png.h index 827851339..44371da58 100644 --- a/png.h +++ b/png.h @@ -159,9 +159,9 @@ * DLLNUM will change each time there are forward or backward changes * in binary compatibility (e.g., when a new feature is added). * - * See libpng.txt or libpng.3 for more information. The PNG specification - * is available as a W3C Recommendation and as an ISO Specification, - *