Relocate docs/ --> doc/, like most other projects have

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

ChangeLog.md

@@ -20,7 +20,7 @@ Bug fix release, but also cgroups and a new progress!
 * Support for tracking custom PID files, using `pid:!/path/to/foo.pid`,
   useful with new `sysv` or `service` which fork to background
 * Support starting run/task/services without absolute path, trust `$PATH`
-* Add support for `--disable-docs` and `--disable-contrib` to speed up
+* Add support for `--disable-doc` and `--disable-contrib` to speed up
   builds and work around issue with massively parallel builds
 * Add support for `@console` also for external getty
 * Add `-b`, batch mode, for non-interactive use to `initctl`
@@ -183,7 +183,7 @@ This version requires at least libuEv v2.1.0 and libite v2.0.1
   possibility of running a second stage mount command before files in
   `/run` and similar are created
 * Skip `gdbserver` when unleashing the grim reaper at shutdown
-* Distribute and install `docs/` and `contrib/` directories
+* Distribute and install `doc/` and `contrib/` directories
 
 ### Fixes
 
@@ -246,7 +246,7 @@ distributions.
 * Ensure plugins always have a default name, file name
 * Reorganization, move all source files to a `src/` sub-directory
 * Add support for `initctl <list|enable|disable> <SVC>`, much needed by
-  distributions.  See [docs/distro.md](docs/distro.md) for details
+  distributions.  See [doc/distro.md](doc/distro.md) for details
 * Remove `UNUSED()` macro, mentioned here because it may have been used
   by external plugin developers.  Set `-Wno-unused-parameter` instead
 * New table headings in `initctl`, using `top` style inverted text

Makefile.am

@@ -6,8 +6,8 @@ EXTRA_DIST         = README.md LICENSE ChangeLog.md contrib/finit.conf
 if CONTRIB
 SUBDIRS           += contrib
 endif
-if DOCS
+if DOC
-SUBDIRS           += docs
+SUBDIRS           += doc
 endif
 
 # Compat hook

README.md

@@ -3,19 +3,19 @@
 
 * [Introduction](#introduction)
 * [Features](#features)
-* [Bootstrap](docs/bootstrap.md#bootstrap)
+* [Bootstrap](doc/bootstrap.md#bootstrap)
 * [Runlevels](#runlevels)
-* [Syntax](docs/config.md#syntax)
+* [Syntax](doc/config.md#syntax)
-  * [Inetd](docs/inetd.md#inetd)
+  * [Inetd](doc/inetd.md#inetd)
   * [Runparts & /etc/rc.local](#runparts--etcrclocal)
-  * [Hooks, Callbacks & Plugins](docs/plugins.md#hooks-callbacks--plugins)
+  * [Hooks, Callbacks & Plugins](doc/plugins.md#hooks-callbacks--plugins)
 * [Rebooting & Halting](#rebooting--halting)
 * [Commands & Status](#commands--status)
-* [Tips & Tricks with the kernel cmdline](docs/cmdline.md)
+* [Tips & Tricks with the kernel cmdline](doc/cmdline.md)
-* [Building](docs/build.md#building)
+* [Building](doc/build.md#building)
-  * [Running](docs/build.md#running)
+  * [Running](doc/build.md#running)
-  * [Recovery](docs/build.md#recovery)
+  * [Recovery](doc/build.md#recovery)
-  * [Debugging](docs/build.md#debugging)
+  * [Debugging](doc/build.md#debugging)
 * [Requirements](#requirements)
 * [Origin & References](#origin--references)
 
@@ -109,7 +109,7 @@ tty [12345] @console noclear nologin
 ```
 
 The `service` stanza, as well as `task`, `run`, `inetd` and others are
-described in full in [docs/config.md](docs/config.md).  Here's a quick
+described in full in [doc/config.md](doc/config.md).  Here's a quick
 overview of some of the most common components needed to start a UNIX
 daemon:
 
@@ -130,7 +130,7 @@ advanced uses as well:
 
     service /usr/sbin/sshd -D
 
-Dependencies are handled using [conditions](docs/conditions.md).  One of
+Dependencies are handled using [conditions](doc/conditions.md).  One of
 the most common conditions is to wait for basic networking to become
 available:
 
@@ -171,7 +171,7 @@ Start, monitor and restart services should they fail.
 
 **Inetd**
 
-Finit comes with a built-in [inetd server](docs/inetd.md).  No need to
+Finit comes with a built-in [inetd server](doc/inetd.md).  No need to
 maintain a separate config file for services that you want to start on
 demand.
 
@@ -186,7 +186,7 @@ Built-in optional inetd services:
 - discard [RFC863][]
 - time (rdate) [RFC868][]
 
-For more information, see [docs/inetd.md](docs/inetd.md).
+For more information, see [doc/inetd.md](doc/inetd.md).
 
 
 **Getty**
@@ -213,7 +213,7 @@ tty [12345] @console linux noclear
 
 Notice the optional `noclear`, `nowait`, and `nologin` flags.  The
 latter is for skipping the login process entirely. For more information,
-see [docs/config.md](docs/config.md#syntax).
+see [doc/config.md](doc/config.md#syntax).
 
 
 **Runlevels**
@@ -258,7 +258,7 @@ Extensions and functionality not purely related to what an `/sbin/init`
 needs to start a system are available as a set of plugins that either
 hook into the boot process or respond to various I/O.
 
-For more information, see [docs/plugins.md](docs/plugins.md).
+For more information, see [doc/plugins.md](doc/plugins.md).
 
 
 **Progress**
@@ -277,7 +277,7 @@ append="init=/sbin/finit splash"
 
 For a really nice boot, add `quiet` as well.  This silences the output
 from the kernel, leaving only warnings and errors.  For other kernel
-command line parameters, see [docs/build.md](docs/build.md#recovery).
+command line parameters, see [doc/build.md](doc/build.md#recovery).
 
 
 **Automatic Reload**
@@ -313,8 +313,8 @@ Right after the runlevel change when all services have started properly,
 No configuration stanza in `/etc/finit.conf` is required for `rc.local`.
 If it exists and is an executable shell script Finit calls it at the very
 end of the boot, before calling the `HOOK_SYSTEM_UP`.  See more on hooks
-in [docs/plugins.md](docs/plugins.md#hooks), and about the system bootstrap
+in [doc/plugins.md](doc/plugins.md#hooks), and about the system bootstrap
-in [docs/bootstrap.md](docs/bootstrap.md).
+in [doc/bootstrap.md](doc/bootstrap.md).
 
 
 Runlevels
@@ -392,7 +392,7 @@ section.
 For compatibility reasons Finit listens to the same set of signals as
 BusyBox init.  This is not 100% compatible with SysV init, but clearly
 the more common combination for Finit.  For more details, see
-[docs/signals.md](docs/signals.md).
+[doc/signals.md](doc/signals.md).
 
 Finit also listens to the classic SysV init FIFO, used by `telinit`.
 Support for this is implemented by the `initctl.so` plugin.  Hence,
@@ -463,7 +463,7 @@ Commands:
 
 For services *not* supporting `SIGHUP` the `<!>` notation in the .conf
 file must be used to tell Finit to stop and start it on `reload` and
-`runlevel` changes.  If `<>` holds more [conditions](docs/conditions.md),
+`runlevel` changes.  If `<>` holds more [conditions](doc/conditions.md),
 these will also affect how a service is maintained.
 
 **Note:** even though it is possible to start services not belonging in

configure.ac

@@ -9,7 +9,7 @@ AC_CONFIG_FILES([Makefile
 	contrib/alpine/Makefile contrib/alpine/finit.d/Makefile contrib/alpine/finit.d/available/Makefile
 	contrib/debian/Makefile contrib/debian/finit.d/Makefile contrib/debian/finit.d/available/Makefile contrib/debian/grub.d/Makefile
 	contrib/void/Makefile   contrib/void/finit.d/Makefile   contrib/void/finit.d/available/Makefile
-	docs/Makefile
+	doc/Makefile
 	plugins/Makefile
 	src/Makefile])
 
@@ -89,9 +89,9 @@ AC_ARG_ENABLE(logrotate,
         AS_HELP_STRING([--disable-logrotate], [Disable built-in rotation of /var/log/wtmp, default enabled]),,[
 	enable_logrotate=yes])
 
-AC_ARG_ENABLE(docs,
+AC_ARG_ENABLE(doc,
-        AS_HELP_STRING([--disable-docs], [Disable build and install of docs section]),,[
+        AS_HELP_STRING([--disable-doc], [Disable build and install of doc/ section]),,[
-	enable_docs=yes])
+	enable_doc=yes])
 
 AC_ARG_ENABLE(contrib,
         AS_HELP_STRING([--disable-contrib], [Disable build and install of contrib section]),,[
@@ -246,7 +246,7 @@ AM_CONDITIONAL(STATIC,    [test "x$enable_static" = "xyes"])
 AM_CONDITIONAL(INETD,     [test "x$enable_inetd" = "xyes"])
 AM_CONDITIONAL(WATCHDOGD, [test "x$enable_watchdog" = "xyes"])
 AM_CONDITIONAL(LOGIT,     [test "x$enable_logit" = "xyes"])
-AM_CONDITIONAL(DOCS,      [test "x$enable_docs" = "xyes"])
+AM_CONDITIONAL(DOC,       [test "x$enable_doc" = "xyes"])
 AM_CONDITIONAL(CONTRIB,   [test "x$enable_contrib" = "xyes"])
 
 # Override default libdir, used for plugins and rescue.conf
@@ -286,7 +286,7 @@ Behavior:
   Plugins...............: $plugins
 
 Optional features:
-  Install docs/.........: $enable_docs
+  Install doc/..........: $enable_doc
   Install contrib/......: $enable_contrib
   Built-in inetd........: $enable_inetd
   Built-in watchdogd....: $enable_watchdog

doc/Makefile.am

@@ -1,4 +1,4 @@
-docsdir   := @docdir@/docs
+docsdir   := @docdir@/doc
 docs_DATA  = config.md conditions.md distro.md inetd.md plugins.md	\
 	     service.md signals.md svc-machine.png cmdline.md
 EXTRA_DIST = $(docs_DATA)

src/service.c

@@ -827,7 +827,8 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
  *
  * Service conditions can be: svc/<PATH> for PID files, net/<IFNAME>/up
  * and net/<IFNAME>/exists.  The condition handling is further described
- * docs/conditions.md.
+ * in doc/conditions.md, but worth mentioning here is that the condition
+ * name itself can be modified using the :ID and name:foo syntax.
  *
  * For multiple instances of the same command, e.g. multiple DHCP
  * clients, the user must enter an ID, using the :ID syntax.