2010-01-01 Robert Millan <rmh.grub@aybabtu.com>

	Use more standard `doc' directory.

	* docs: Rename to ...
	* doc: ... this.  Update all users.

	* doc/multiboot.texi: Fix an obsolete reference to `docs' directory
	in GRUB distribution.

diff --git a/.bzrignore b/.bzrignore
index 4624002ac2c41d8ef4f4f1ed2be186064a8dfb24..65e15905583812ba5d706c23e9594ddb3505cbd2 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -7,9 +7,15 @@ config.log
 config.status
 stamp-h
 stamp-h1
-docs/Makefile
-docs/*.info*
-docs/.deps
+doc/Makefile
+doc/*.info*
+doc/.deps
+doc/Makefile.in
+doc/boot.S.texi
+doc/kernel
+doc/kernel.c.texi
+doc/multiboot.h.texi
+doc/texinfo.tex
 Makefile.in
 aclocal.m4
 config.h.in
@@ -17,9 +23,3 @@ configure
 depcomp
 install-sh
 missing
-docs/Makefile.in
-docs/boot.S.texi
-docs/kernel
-docs/kernel.c.texi
-docs/multiboot.h.texi
-docs/texinfo.tex

diff --git a/ChangeLog b/ChangeLog
index 055db92e3bc7ce1e38d63810baf133a8a7529d4b..99a63c232b90615feb5900bbd57c3abcbee51311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Use more standard `doc' directory.
+
+       * docs: Rename to ...
+       * doc: ... this.  Update all users.
+
+       * doc/multiboot.texi: Fix an obsolete reference to `docs' directory
+       in GRUB distribution.
+
 2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
 
        Make ia32 libc unnecessary on amd64.

diff --git a/Makefile.am b/Makefile.am
index fcaf291e8e629a21461fc3d5c5ddbde7d02d3c09..036e05bea5c8b0cb538cc52ee2cf4476accceb93 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 # Do not change this order if you don't know what you are doing.
 AUTOMAKE_OPTIONS = 1.7 gnu
-SUBDIRS = docs
+SUBDIRS = doc

diff --git a/configure.ac b/configure.ac
index 6ce920ae5ac5442a864c912696b18c0daacb69af..706cb57f7617fb89bfaba3ffc169173060f0e6f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl USE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
 AC_INIT([Multiboot], [0.6.96], [bug-grub@gnu.org])
-AC_CONFIG_SRCDIR([docs/multiboot.texi])
+AC_CONFIG_SRCDIR([doc/multiboot.texi])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
 
@@ -45,5 +45,5 @@ AC_SUBST(CCASFLAGS)
 CFLAGS="-m32 -nostdlib $CFLAGS"
 
 dnl Output.
-AC_CONFIG_FILES([Makefile docs/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile])
 AC_OUTPUT

diff --git a/docs/Makefile.am b/doc/Makefile.am
similarity index 100%
rename from docs/Makefile.am
rename to doc/Makefile.am

diff --git a/docs/boot.S b/doc/boot.S
similarity index 100%
rename from docs/boot.S
rename to doc/boot.S

diff --git a/docs/kernel.c b/doc/kernel.c
similarity index 100%
rename from docs/kernel.c
rename to doc/kernel.c

diff --git a/docs/multiboot.h b/doc/multiboot.h
similarity index 100%
rename from docs/multiboot.h
rename to doc/multiboot.h

diff --git a/docs/multiboot.texi b/doc/multiboot.texi
similarity index 99%
rename from docs/multiboot.texi
rename to doc/multiboot.texi
index a9c154860449e100793c1fecb0733806a3bae4e8..3f638a71426ec999658fa63b10f61084704157ab 100644 (file)
--- a/docs/multiboot.texi
+++ b/doc/multiboot.texi
@@ -1075,7 +1075,7 @@ included. The kernel just prints out the Multiboot information structure
 on the screen, so you can make use of the kernel to test a
 Multiboot-compliant boot loader and for reference to how to implement a
 Multiboot kernel. The source files can be found under the directory
-@file{docs} in the GRUB distribution.
+@file{doc} in the Multiboot source distribution.
 
 The kernel @file{kernel} consists of only three files: @file{boot.S},
 @file{kernel.c} and @file{multiboot.h}. The assembly source

diff --git a/docs/src2texi b/doc/src2texi
similarity index 100%
rename from docs/src2texi
rename to doc/src2texi