# HG changeset patch
# User Rik <rik@octave.org>
# Date 1682441360 25200
# Node ID 5998f6639148e0a6dd38cfebbb44bd7229cf6ed2
# Parent  d77b987a7e0d618820c421b1b8b171d5612f5a29# Parent  88e7edd94e2e3c4b8a141d4b4637cf7487737d50
maint: merge stable to default

diff -r d77b987a7e0d -r 5998f6639148 libinterp/op-kw-docs
--- a/libinterp/op-kw-docs	Tue Apr 25 07:50:29 2023 -0700
+++ b/libinterp/op-kw-docs	Tue Apr 25 09:49:20 2023 -0700
@@ -698,12 +698,13 @@
 @end deftypefn
 @c ## FIXME: Can't have duplicate DOCSTRING entries.  The function methods()
 @c ##        already has a docstring which overrides this keyword definition.
-@c #methods
-@c #@c libinterp/parse-tree/oct-parse.yy
-@c #-*- texinfo -*-
-@c #@deftypefn {} {} methods
-@c #Begin a methods block in a classdef definition.
-@c #@end deftypefn
+@c ##        If this is fixed, place \x1d char before keyword "methods".
+@c ## methods
+@c ## @c libinterp/parse-tree/oct-parse.yy
+@c ## -*- texinfo -*-
+@c ## @deftypefn {} {} methods
+@c ## Begin a methods block in a classdef definition.
+@c ## @end deftypefn
 otherwise
 @c libinterp/parse-tree/oct-parse.yy
 -*- texinfo -*-
@@ -755,8 +756,9 @@
 @end deftypefn
 @c ## FIXME: Can't have duplicate DOCSTRING entries.  The function properties()
 @c ##        already has a docstring which overrides this keyword definition.
-@c ## properties
-@c ##  libinterp/parse-tree/oct-parse.yy
+@c ##        If this is fixed, place \x1d char before keyword "properties".
+@c ## properties
+@c ## @c libinterp/parse-tree/oct-parse.yy
 @c ## -*- texinfo -*-
 @c ## @deftypefn {} {} properties
 @c ## Begin a properties block in a classdef definition.