From ccaf2682c79974cee368d2f3b0611dabc1361df5 Mon Sep 17 00:00:00 2001
From: Ben Kaduk <kaduk@mit.edu>
Date: Tue, 6 Nov 2012 22:15:50 -0500
Subject: Rename doc subdirectories

We like these names better, and they match the PDF document filenames.

admins -> admin
appldev -> appdev
users -> user

and catch up where the names are used elsewhere.

The relay/ directory has been removed, with its contents moved to the
top level in build_this.rst and a new about.rst.

The section headers for kadmind, krb5kdc, sserver, kpasswd, kswitch,
and sclient are misdetected as conflict markers.
bigredbutton: whitespace

ticket: 7433
tags: pullup
---
 src/doc/Makefile.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 3c5d3f3b5..521871319 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -15,17 +15,18 @@ RST_SOURCES= _static \
 	_templates \
 	conf.py \
 	index.rst \
-	admins \
-	appldev \
+	admin \
+	appdev \
 	basic \
 	build \
 	plugindev \
-	users \
+	user \
+	about.rst \
+	build_this.rst \
 	mitK5defaults.rst \
 	mitK5features.rst \
 	mitK5license.rst \
 	notice.rst \
-	relay \
 	resources.rst
 
 PDFDIR=$(docsrc)/pdf
@@ -92,9 +93,9 @@ composite: Doxyfile $(docsrc)/version.py
 	for i in $$do_subdirs; do \
 		cp -r $(docsrc)/$$i rst_composite; \
 	done
-	cp rst_apiref/*.rst rst_composite/appldev/refs/api
-	cp rst_apiref/types/*.rst rst_composite/appldev/refs/types
-	cp rst_apiref/macros/*.rst rst_composite/appldev/refs/macros
+	cp rst_apiref/*.rst rst_composite/appdev/refs/api
+	cp rst_apiref/types/*.rst rst_composite/appdev/refs/types
+	cp rst_apiref/macros/*.rst rst_composite/appdev/refs/macros
 	cp $(docsrc)/version.py rst_composite
 
 Doxyfile: $(srcdir)/Doxyfile.in
-- 
cgit