[shepherd] 02/03: doc: Move manual to the 'doc' directory.

[Mathieu Lirzin]

mthl pushed a commit to branch master
in repository shepherd.

commit 202e846a9908e9779df6ab5192de70ff874b129e
Author: Mathieu Lirzin <address@hidden>
Date:   Wed Jan 27 18:59:16 2016 +0100

    doc: Move manual to the 'doc' directory.
    
    * doc/shepherd.texi: Moved from the root directory.
    * doc/fdl-1.3.texi: Likewise.
    * Makefile.am (info_TEXINFOS): Add a 'doc/' prefix to 'shepherd.texi'.
    (EXTRA_DIST): Remove 'fdl-1.3.texi'.
    (doc_shepherd_TEXINFOS): New variable.
    * .gitignore: Update it.
---
 .gitignore                         |   49 ++++++++++++++++++-----------------
 Makefile.am                        |    4 +-
 fdl-1.3.texi => doc/fdl-1.3.texi   |    0
 shepherd.texi => doc/shepherd.texi |    0
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7cb94f2..111817f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,29 @@
-/configure
-/shepherd.info
-/stamp-vti
-/version.texi
+*.go
+*~
+,*
+.dirstamp
+/*.1
+/*.8
+/INSTALL
+/aclocal.m4
+/autom4te.cache
+/build-aux/*
 /config.cache
 /config.log
 /config.scm
 /config.status
-/herd
-/shepherd
+/configure
+/doc/shepherd.info
+/doc/stamp-vti
+/doc/version.texi
 /examples/Makefile
-/autom4te.cache
-/build-aux/*
-Makefile.in
-Makefile
-*~
-,*
+/halt
+/herd
 /missing
-/texinfo.tex
-/INSTALL
-/aclocal.m4
-*.go
 /modules/shepherd/config.scm
+/modules/shepherd/system.scm
+/reboot
+/shepherd
 /shepherd.aux
 /shepherd.cp
 /shepherd.cps
@@ -28,28 +31,26 @@ Makefile
 /shepherd.fns
 /shepherd.ky
 /shepherd.log
+/shepherd.pdf
 /shepherd.pg
 /shepherd.toc
 /shepherd.tp
 /shepherd.tps
 /shepherd.vr
 /shepherd.vrs
-/modules/shepherd/system.scm
-/halt
-/reboot
-/shepherd.pdf
 /test-suite.log
 /tests/basic.log
 /tests/basic.trs
 /tests/misbehaved-client.log
 /tests/misbehaved-client.trs
-/tests/respawn.log
-/tests/respawn.trs
 /tests/no-home.log
 /tests/no-home.trs
+/tests/respawn.log
+/tests/respawn.trs
 /tests/sigint.log
 /tests/sigint.trs
 /tests/status-sexp.log
 /tests/status-sexp.trs
-/*.1
-/*.8
+/texinfo.tex
+Makefile
+Makefile.in
diff --git a/Makefile.am b/Makefile.am
index a7c73c1..8527d11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,8 @@ CLEANFILES =                                          \
   $(bin_SCRIPTS) $(sbin_SCRIPTS)
 
 # Documentation.
-info_TEXINFOS = shepherd.texi
+info_TEXINFOS = doc/shepherd.texi
+doc_shepherd_TEXINFOS = doc/fdl-1.3.texi
 
 AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V))
 AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
@@ -94,7 +95,6 @@ dist_man8_MANS = halt.8 reboot.8
 # Things not automatically included in the distribution.
 EXTRA_DIST =                           \
   ChangeLog-2003                       \
-  fdl-1.3.texi                         \
   QUESTIONS                            \
   $(templates)                         \
   doc/examples/README                  \
diff --git a/fdl-1.3.texi b/doc/fdl-1.3.texi
similarity index 100%
rename from fdl-1.3.texi
rename to doc/fdl-1.3.texi
diff --git a/shepherd.texi b/doc/shepherd.texi
similarity index 100%
rename from shepherd.texi
rename to doc/shepherd.texi