diff options
author | jbj <devnull@localhost> | 2005-01-03 02:02:54 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2005-01-03 02:02:54 +0000 |
commit | 751f7e3b54d87e054e5fc4cf547eb99d04087dd0 (patch) | |
tree | df2752b2ad8e7035bca4ef850a3e6dbfed84388c /file/doc | |
parent | 7793ec11ecf1d3024b7440b3e04bde57d3862b72 (diff) | |
download | rpm-751f7e3b54d87e054e5fc4cf547eb99d04087dd0.tar.gz rpm-751f7e3b54d87e054e5fc4cf547eb99d04087dd0.tar.bz2 rpm-751f7e3b54d87e054e5fc4cf547eb99d04087dd0.zip |
Upgrade to file-4.12 (with RH patches).
CVS patchset: 7661
CVS date: 2005/01/03 02:02:54
Diffstat (limited to 'file/doc')
-rw-r--r-- | file/doc/Makefile.am | 3 | ||||
-rw-r--r-- | file/doc/libmagic.man | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/file/doc/Makefile.am b/file/doc/Makefile.am index d3e28e747..4a78589ce 100644 --- a/file/doc/Makefile.am +++ b/file/doc/Makefile.am @@ -5,8 +5,7 @@ else man_MAGIC = magic.4 endif fsect = @fsect@ -#man_MANS = file.1 $(man_MAGIC) libmagic.3 -noinst_MANS = file.1 $(man_MAGIC) libmagic.3 +man_MANS = file.1 $(man_MAGIC) libmagic.3 EXTRA_DIST = file.man magic.man libmagic.man CLEANFILES = $(man_MANS) diff --git a/file/doc/libmagic.man b/file/doc/libmagic.man index c60a04480..b4b343af0 100644 --- a/file/doc/libmagic.man +++ b/file/doc/libmagic.man @@ -11,8 +11,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -223,6 +221,6 @@ The compiled default magic database. .Xr file __CSECTION__ , .Xr magic __FSECTION__ .Sh AUTHORS -Måns Rullgård Initial libmagic implementation, +MÃ¥ns RullgÃ¥rd Initial libmagic implementation, and configuration. Christos Zoulas API cleanup, error code and allocation handling. |