Fixup some documentation references

diff --git a/README.md b/README.md
index b6be423e48e075265df2f443616d12894584fbc7..b72e9c66b0d1c4dee65d551089232733275dd0da 100644 (file)
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ mailing lists first to determine whether it really is a defect or
 missing feature.
 
 Instructions for gathering data for defect reports can be found in
-`doc/source/bugs.md` or on the [wiki](https://wiki.freeradius.org/project/bug-reports).
+`doc/developers/bugs.adoc` or on the [wiki](https://wiki.freeradius.org/project/bug-reports).
 
 Under no circumstances should the issue tracker be used for support
 requests, those questions belong on the user's mailing list.  If you

diff --git a/configure b/configure
index eb4a8fd37d022e752927efd8e4e4ddc817613e36..adda1bf6f0e9728df62b2c16bc91362c9f7a1419 100755 (executable)
--- a/configure
+++ b/configure
@@ -8108,7 +8108,7 @@ fi
 if test "x$ac_cv_lib_talloc__talloc" != "xyes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: talloc library not found. Use --with-talloc-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: talloc library not found. Use --with-talloc-lib-dir=<path>." >&2;}
-  as_fn_error $? "FreeRADIUS requires libtalloc.  Please read doc/source/dependencies.rst for further instructions." "$LINENO" 5
+  as_fn_error $? "FreeRADIUS requires libtalloc.  Please read doc/developers/dependencies.adoc for further instructions." "$LINENO" 5
 fi
 
 TALLOC_LIBS="${smart_lib}"
@@ -8301,7 +8301,7 @@ fi
   if test "x$ac_cv_lib_kqueue_kqueue" != "xyes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: kqueue library not found. Use --with-kqueue-lib-dir=<path>." >&5
 $as_echo "$as_me: WARNING: kqueue library not found. Use --with-kqueue-lib-dir=<path>." >&2;}
-    as_fn_error $? "FreeRADIUS requires libkqueue (or system kqueue).  Please read doc/source/dependencies.rst for further instructions." "$LINENO" 5
+    as_fn_error $? "FreeRADIUS requires libkqueue (or system kqueue).  Please read doc/developers/dependencies.adoc for further instructions." "$LINENO" 5
   fi
 fi
 

diff --git a/configure.ac b/configure.ac
index 6cbef0bffe7bec69d64da9e4b183782b1f887199..3d6f50fe8206c7ead0eba1ba053c079704f3fb78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -900,7 +900,7 @@ smart_try_dir="$talloc_lib_dir"
 FR_SMART_CHECK_LIB(talloc, _talloc)
 if test "x$ac_cv_lib_talloc__talloc" != "xyes"; then
   AC_MSG_WARN([talloc library not found. Use --with-talloc-lib-dir=<path>.])
-  AC_MSG_ERROR([FreeRADIUS requires libtalloc.  Please read doc/source/dependencies.rst for further instructions.])
+  AC_MSG_ERROR([FreeRADIUS requires libtalloc.  Please read doc/developers/dependencies.adoc for further instructions.])
 fi
 
 TALLOC_LIBS="${smart_lib}"
@@ -918,7 +918,7 @@ if test "x$ac_cv_func_kqueue" != "xyes"; then
   FR_SMART_CHECK_LIB(kqueue, kqueue)
   if test "x$ac_cv_lib_kqueue_kqueue" != "xyes"; then
     AC_MSG_WARN([kqueue library not found. Use --with-kqueue-lib-dir=<path>.])
-    AC_MSG_ERROR([FreeRADIUS requires libkqueue (or system kqueue).  Please read doc/source/dependencies.rst for further instructions.])
+    AC_MSG_ERROR([FreeRADIUS requires libkqueue (or system kqueue).  Please read doc/developers/dependencies.adoc for further instructions.])
   fi
 fi
 

diff --git a/raddb/mods-available/detail b/raddb/mods-available/detail
index 1eff82ddd9ec8159495bb051fae38c0c93541e8e..bd0b9bb6469034a1f09dd8e6720c88f540808ff9 100644 (file)
--- a/raddb/mods-available/detail
+++ b/raddb/mods-available/detail
@@ -26,7 +26,7 @@ detail {
        #  rotation'.
        #
        #  If your detail files are large, you may also want to
-       #  add a `:%H` (see `doc/configuration/variables.rst`) to
+       #  add a `:%H` (see `doc/unlang/xlat_character.adoc`) to
        #  the end of it, to create a new detail file every hour.
        #
        #  e.g.:
@@ -88,7 +88,7 @@ detail {
        #  By default, we use the ctime format (see `man 3 ctime` for details).
        #
        #  The header can be customised by editing this string.
-       #  See `doc/configuration/variables.rst` for a description
+       #  See `doc/unlang/xlat.adoc` for a description
        #  of what can be put here.
        #
        header = "%t"

diff --git a/raddb/mods-available/exec b/raddb/mods-available/exec
index fbba3eb92decf5e019cd54ef4cfac5e281ae1c27..e805f14412976ef89854793edf0f343393f020d8 100644 (file)
--- a/raddb/mods-available/exec
+++ b/raddb/mods-available/exec
@@ -21,7 +21,7 @@
 #
 #  The RADIUS attributes from the user request will be placed
 #  into environment variables of the executed program, as
-#  described in `man unlang` and in `doc/configuration/variables.rst`
+#  described in `man unlang` and in `doc/unlang/xlat.adoc`
 #
 #  The return value of the program run determines the result of the exec
 #  instance call as follows:

diff --git a/raddb/mods-available/mschap b/raddb/mods-available/mschap
index f53d4c8ca77ef0397752123160d0497b4bb2a9d9..33e42c3f66eb6e973154b74004f2d1fab46b6850 100644 (file)
--- a/raddb/mods-available/mschap
+++ b/raddb/mods-available/mschap
@@ -267,7 +267,7 @@ mschap {
                #  ntlm_auth_domain:: The domain name for ntlm_auth password change.
                #
                #  This module support `MS-CHAPv2` (not v1) password
-               #  change requests.  See `doc/modules/mschap.rst` for
+               #  change requests.  See `doc/howto/modules/mschap.adoc` for
                #  some IMPORTANT information.
                #
                #  Samba/ntlm_auth - if you are using `ntlm_auth` to validate

diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
index 37f334ae017182ae769fa18a49ca0b4f6a7c8991..fdcf630decbc0faca97842dd7464f1380216b694 100644 (file)
--- a/src/lib/server/xlat_eval.c
+++ b/src/lib/server/xlat_eval.c
@@ -1462,7 +1462,7 @@ static size_t xlat_process(TALLOC_CTX *ctx, char **out, REQUEST *request, xlat_e
 
 /** Replace %whatever in a string.
  *
- * See 'doc/configuration/variables.rst' for more information.
+ * See 'doc/unlang/xlat.adoc' for more information.
  *
  * @param[in] ctx              to allocate expansion buffers in.
  * @param[out] out             Where to write pointer to output buffer.
@@ -1512,7 +1512,7 @@ static ssize_t _xlat_eval(TALLOC_CTX *ctx, char **out, size_t outlen, REQUEST *r
 
 /** Replace %whatever in a string.
  *
- * See 'doc/configuration/variables.rst' for more information.
+ * See 'doc/unlang/xlat.adoc' for more information.
  *
  * @param[in] ctx              to allocate expansion buffers in.
  * @param[out] out             Where to write pointer to output buffer.

diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index ef34f318219e630893de70a93a25eb8e77e07652..3a4550c6cfe92e061b61f83706a089a05a9e4a48 100644 (file)
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -51,7 +51,7 @@ extern "C" {
 /** Types of unlang_t nodes
  *
  * Here are our basic types: unlang_t, unlang_group_t, and unlang_module_t. For an
- * explanation of what they are all about, see doc/configurable_failover.rst
+ * explanation of what they are all about, see doc/unlang/configurable_failover.adoc
  */
 typedef enum {
        UNLANG_TYPE_NULL = 0,                   //!< unlang type not set.

diff --git a/suse/freeradius.spec b/suse/freeradius.spec
index 0f3ce1dbf85940fa3603920ae43835a1eb563ce5..b76acc86d34285533214f2750abfecb4a619640e 100644 (file)
--- a/suse/freeradius.spec
+++ b/suse/freeradius.spec
@@ -212,7 +212,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 # doc
 %doc suse/README.SuSE
-%doc doc/* LICENSE COPYRIGHT CREDITS README.rst
+%doc doc/* LICENSE COPYRIGHT CREDITS README.md
 # SuSE
 %{_sysconfdir}/init.d/freeradius
 %config %{_sysconfdir}/pam.d/radiusd