From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 1 Jan 2010 20:02:24 +0000 (+0000)
Subject: 2010-01-01  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a573f875c987a1c491abca43a833efe994356d;p=thirdparty%2Fgrub.git

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 4624002ac..65e159055 100644
--- 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 055db92e3..99a63c232 100644
--- 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 fcaf291e8..036e05bea 100644
--- 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 6ce920ae5..706cb57f7 100644
--- 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 a9c154860..3f638a714 100644
--- 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