From: Sami Kerola Date: Fri, 12 Aug 2011 18:19:52 +0000 (+0200) Subject: docs: Documentation directory added X-Git-Tag: v2.21-rc1~471^2~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f98d4f766e39efd255c9b70d3780feea9c7a7898;p=thirdparty%2Futil-linux.git docs: Documentation directory added Move readme, licence, change log, relese notes and other supplementary files to a Documentation directory. This commit does not change contents of any other but few Makefile.am files. Signed-off-by: Sami Kerola --- diff --git a/README.devel b/Documentation/README.devel similarity index 100% rename from README.devel rename to Documentation/README.devel diff --git a/TODO b/Documentation/TODO similarity index 100% rename from TODO rename to Documentation/TODO diff --git a/libblkid/README.blkid b/Documentation/blkid.txt similarity index 100% rename from libblkid/README.blkid rename to Documentation/blkid.txt diff --git a/misc-utils/README.cal b/Documentation/cal.txt similarity index 100% rename from misc-utils/README.cal rename to Documentation/cal.txt diff --git a/fdisk/README.cfdisk b/Documentation/cfdisk.txt similarity index 100% rename from fdisk/README.cfdisk rename to Documentation/cfdisk.txt diff --git a/text-utils/README.col b/Documentation/col.txt similarity index 100% rename from text-utils/README.col rename to Documentation/col.txt diff --git a/misc-utils/README.ddate b/Documentation/ddate.txt similarity index 100% rename from misc-utils/README.ddate rename to Documentation/ddate.txt diff --git a/DEPRECATED b/Documentation/deprecated.txt similarity index 100% rename from DEPRECATED rename to Documentation/deprecated.txt diff --git a/example.files/filesystems b/Documentation/example.files/filesystems similarity index 100% rename from example.files/filesystems rename to Documentation/example.files/filesystems diff --git a/example.files/fstab b/Documentation/example.files/fstab similarity index 100% rename from example.files/fstab rename to Documentation/example.files/fstab diff --git a/example.files/motd b/Documentation/example.files/motd similarity index 100% rename from example.files/motd rename to Documentation/example.files/motd diff --git a/example.files/securetty b/Documentation/example.files/securetty similarity index 100% rename from example.files/securetty rename to Documentation/example.files/securetty diff --git a/example.files/shells b/Documentation/example.files/shells similarity index 100% rename from example.files/shells rename to Documentation/example.files/shells diff --git a/example.files/udev-raw.rules b/Documentation/example.files/udev-raw.rules similarity index 100% rename from example.files/udev-raw.rules rename to Documentation/example.files/udev-raw.rules diff --git a/fdisk/README.fdisk b/Documentation/fdisk.txt similarity index 100% rename from fdisk/README.fdisk rename to Documentation/fdisk.txt diff --git a/getopt/README b/Documentation/getopt.txt similarity index 100% rename from getopt/README rename to Documentation/getopt.txt diff --git a/getopt/Changelog b/Documentation/getopt_changelog.txt similarity index 100% rename from getopt/Changelog rename to Documentation/getopt_changelog.txt diff --git a/tests/README b/Documentation/howto-tests.txt similarity index 100% rename from tests/README rename to Documentation/howto-tests.txt diff --git a/hwclock/README.hwclock b/Documentation/hwclock.txt similarity index 100% rename from hwclock/README.hwclock rename to Documentation/hwclock.txt diff --git a/licenses/COPYING.GPL b/Documentation/licenses/COPYING.GPL similarity index 100% rename from licenses/COPYING.GPL rename to Documentation/licenses/COPYING.GPL diff --git a/licenses/COPYING.UCB b/Documentation/licenses/COPYING.UCB similarity index 100% rename from licenses/COPYING.UCB rename to Documentation/licenses/COPYING.UCB diff --git a/getopt/COPYING b/Documentation/licenses/COPYING.getopt similarity index 100% rename from getopt/COPYING rename to Documentation/licenses/COPYING.getopt diff --git a/libblkid/COPYING.libblkid b/Documentation/licenses/COPYING.libblkid similarity index 100% rename from libblkid/COPYING.libblkid rename to Documentation/licenses/COPYING.libblkid diff --git a/libmount/COPYING.libmount b/Documentation/licenses/COPYING.libmount similarity index 100% rename from libmount/COPYING.libmount rename to Documentation/licenses/COPYING.libmount diff --git a/libuuid/COPYING.libuuid b/Documentation/licenses/COPYING.libuuid similarity index 100% rename from libuuid/COPYING.libuuid rename to Documentation/licenses/COPYING.libuuid diff --git a/text-utils/LICENSE.pg b/Documentation/licenses/LICENSE.pg similarity index 100% rename from text-utils/LICENSE.pg rename to Documentation/licenses/LICENSE.pg diff --git a/term-utils/README.modems-with-agetty b/Documentation/modems-with-agetty.txt similarity index 100% rename from term-utils/README.modems-with-agetty rename to Documentation/modems-with-agetty.txt diff --git a/mount/README.mount b/Documentation/mount.txt similarity index 100% rename from mount/README.mount rename to Documentation/mount.txt diff --git a/text-utils/README.pg b/Documentation/pg.txt similarity index 100% rename from text-utils/README.pg rename to Documentation/pg.txt diff --git a/login-utils/README.poeigl b/Documentation/poeigl.txt similarity index 100% rename from login-utils/README.poeigl rename to Documentation/poeigl.txt diff --git a/docs/v2.13-ReleaseNotes b/Documentation/releases/v2.13-ReleaseNotes similarity index 100% rename from docs/v2.13-ReleaseNotes rename to Documentation/releases/v2.13-ReleaseNotes diff --git a/docs/v2.14-ReleaseNotes b/Documentation/releases/v2.14-ReleaseNotes similarity index 100% rename from docs/v2.14-ReleaseNotes rename to Documentation/releases/v2.14-ReleaseNotes diff --git a/docs/v2.15-ReleaseNotes b/Documentation/releases/v2.15-ReleaseNotes similarity index 100% rename from docs/v2.15-ReleaseNotes rename to Documentation/releases/v2.15-ReleaseNotes diff --git a/docs/v2.16-ReleaseNotes b/Documentation/releases/v2.16-ReleaseNotes similarity index 100% rename from docs/v2.16-ReleaseNotes rename to Documentation/releases/v2.16-ReleaseNotes diff --git a/docs/v2.17-ReleaseNotes b/Documentation/releases/v2.17-ReleaseNotes similarity index 100% rename from docs/v2.17-ReleaseNotes rename to Documentation/releases/v2.17-ReleaseNotes diff --git a/docs/v2.18-ReleaseNotes b/Documentation/releases/v2.18-ReleaseNotes similarity index 100% rename from docs/v2.18-ReleaseNotes rename to Documentation/releases/v2.18-ReleaseNotes diff --git a/docs/v2.19-ReleaseNotes b/Documentation/releases/v2.19-ReleaseNotes similarity index 100% rename from docs/v2.19-ReleaseNotes rename to Documentation/releases/v2.19-ReleaseNotes diff --git a/docs/v2.20-ReleaseNotes b/Documentation/releases/v2.20-ReleaseNotes similarity index 100% rename from docs/v2.20-ReleaseNotes rename to Documentation/releases/v2.20-ReleaseNotes diff --git a/fdisk/sfdisk.examples b/Documentation/sfdisk.txt similarity index 100% rename from fdisk/sfdisk.examples rename to Documentation/sfdisk.txt diff --git a/Makefile.am b/Makefile.am index b016bbdf5e..b944d4570b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,14 +62,9 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ .version \ autogen.sh \ - README.devel \ README.licensing \ - DEPRECATED \ - licenses \ - example.files \ po/update-potfiles \ - tools \ - docs + Documentation # Arrange so that .tarball-version appears only in the distribution # tarball, and never in a checked-out repository. diff --git a/NEWS b/NEWS index 0e9dba8018..e9873ee431 100644 --- a/NEWS +++ b/NEWS @@ -1,109 +1,109 @@ util-linux 2.20-rc1: Jul 29 2011 -* see docs/v2.20-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.20-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc1-ChangeLog util-linux 2.19: Feb 10 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ChangeLog util-linux 2.19-rc3: Jan 25 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc3-ChangeLog util-linux 2.19-rc2: Jan 25 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc2-ChangeLog util-linux 2.19-rc1: Jan 05 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc1-ChangeLog util-linux-ng 2.18: Jun 30 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ChangeLog util-linux-ng 2.18-rc2: Jun 18 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc2-ChangeLog util-linux-ng 2.18-rc1: Jun 7 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog util-linux-ng 2.17: Jan 8 2010 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog util-linux-ng 2.17-rc3: Dec 10 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc3-ChangeLog util-linux-ng 2.17-rc2: Dec 9 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog util-linux-ng 2.17-rc1: Nov 20 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog util-linux-ng 2.16: Jul 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ChangeLog util-linux-ng 2.16-rc2: Jul 2 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc2-ChangeLog util-linux-ng 2.16-rc1: Jun 28 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc1-ChangeLog util-linux-ng 2.15: May 5 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ChangeLog util-linux-ng 2.15-rc2: Apr 17 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc2-ChangeLog util-linux-ng 2.15-rc1: Mar 18 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc1-ChangeLog util-linux-ng 2.14: Jun 9 2008 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-ChangeLog util-linux-ng 2.14-rc3 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc3-ChangeLog util-linux-ng 2.14-rc2 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc2-ChangeLog util-linux-ng 2.14-rc1 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc1-ChangeLog util-linux-ng 2.13 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog util-linux-ng 2.13-rc3 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc3-ChangeLog util-linux-ng 2.13-rc2 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc2-ChangeLog util-linux-ng 2.13-rc1 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc1-ChangeLog util-linux 2.13-pre7 diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 7cad805d1a..d4e01a2294 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c +EXTRA_DIST = partitiontype.c fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \ $(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \ diff --git a/getopt/Makefile.am b/getopt/Makefile.am index 7c1b66b2c0..f0602b4627 100644 --- a/getopt/Makefile.am +++ b/getopt/Makefile.am @@ -5,6 +5,3 @@ dist_man_MANS = getopt.1 exampledir = $(datadir)/getopt/ dist_example_SCRIPTS = getopt-parse.bash getopt-parse.tcsh - -EXTRA_DIST = README Changelog COPYING - diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am index c7d95f29b5..8fef5b7f9f 100644 --- a/hwclock/Makefile.am +++ b/hwclock/Makefile.am @@ -14,5 +14,3 @@ endif if HAVE_AUDIT hwclock_LDADD += -laudit endif - -EXTRA_DIST = README.hwclock diff --git a/libblkid/Makefile.am b/libblkid/Makefile.am index 59362cfe5b..27f1033f81 100644 --- a/libblkid/Makefile.am +++ b/libblkid/Makefile.am @@ -12,5 +12,5 @@ pkgconfig_DATA = blkid.pc dist_man_MANS = libblkid.3 -EXTRA_DIST = COPYING.libblkid README.blkid blkid.pc.in libblkid.3 +EXTRA_DIST = blkid.pc.in libblkid.3 diff --git a/libmount/Makefile.am b/libmount/Makefile.am index 26111c6621..dbe1317893 100644 --- a/libmount/Makefile.am +++ b/libmount/Makefile.am @@ -10,4 +10,4 @@ endif pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = mount.pc -EXTRA_DIST = COPYING.libmount mount.pc.in +EXTRA_DIST = mount.pc.in diff --git a/libuuid/Makefile.am b/libuuid/Makefile.am index 66fe690985..2bdef33435 100644 --- a/libuuid/Makefile.am +++ b/libuuid/Makefile.am @@ -6,5 +6,5 @@ SUBDIRS = src man pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = uuid.pc -EXTRA_DIST = COPYING.libuuid uuid.pc.in +EXTRA_DIST = uuid.pc.in diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 0bedc0632b..f009f2d09e 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -6,8 +6,6 @@ sbin_PROGRAMS = usrsbin_exec_PROGRAMS = dist_man_MANS = -EXTRA_DIST = README.poeigl - if BUILD_LAST usrbin_exec_PROGRAMS += last dist_man_MANS += last.1 diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 9e2e66bf7b..6b7fa4ba76 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -8,8 +8,6 @@ usrsbin_exec_PROGRAMS = usrbin_exec_PROGRAMS = cal ddate logger look mcookie namei whereis -EXTRA_DIST += README.cal README.ddate - logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c diff --git a/mount/Makefile.am b/mount/Makefile.am index b82464fe37..7aebfff666 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.mount - bin_PROGRAMS = mount umount sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am index b423bbde15..49ad5ff2fb 100644 --- a/term-utils/Makefile.am +++ b/term-utils/Makefile.am @@ -7,8 +7,6 @@ usrsbin_exec_PROGRAMS = dist_man_MANS = script.1 scriptreplay.1 -EXTRA_DIST = README.modems-with-agetty - script_LDADD = if HAVE_UTIL @@ -44,7 +42,7 @@ if BUILD_RESET dist_usrbin_exec_SCRIPTS = reset dist_man_MANS += reset.1 endif -EXTRA_DIST += reset.033c +EXTRA_DIST = reset.033c if BUILD_MESG usrbin_exec_PROGRAMS += mesg diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d4fa1095b..2c7231879d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = helpers EXTRA_DIST = expected \ ts \ functions.sh \ - README \ run.sh clean-local: diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index fbba02843b..b715aafa6f 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.col - usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev tailf column_SOURCES = column.c $(top_srcdir)/lib/strutils.c @@ -42,5 +40,3 @@ more_LDADD = -ltermcap dist_man_MANS += more.1 endif endif - -EXTRA_DIST += README.pg LICENSE.pg