[pull] documentation fixes

[pull] documentation fixes

[Jan Engelhardt]

Please pull from
	git://dev.medozas.de/iptables master

to receive:

	build: trigger reconfigure when extensions/GNUmakefile.in changes
	doc: do not put IPv4 doc into ip6tables.8

[PATCH 1/2] build: trigger reconfigure when extensions/GNUmakefile.in changes

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 41dc280..b8859ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,7 +108,8 @@ tarball:
 	tar -C /tmp -cjf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_TARNAME}-${PACKAGE_VERSION}/;
 	rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
-config.status: include/xtables.h.in include/iptables/internal.h.in
+config.status: extensions/GNUmakefile.in \
+	include/xtables.h.in include/iptables/internal.h.in
 
 # ldconfig may fail when we are not root (as is the case in build systems)
 # so add appropriate protection that it does not let `make` fail.
-- 
1.6.1.3

[PATCH 2/2] doc: do not put IPv4 doc into ip6tables.8

[Jan Engelhardt]

Reference: http://bugs.debian.org/515752
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/GNUmakefile.in |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 1f063c8..256ac08 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -166,13 +166,7 @@ man_run    = \
 			cat "$$f"; \
 			continue; \
 		fi; \
-		f="${srcdir}/libipt_$$ext.man"; \
-		if [ -f "$$f" ]; then \
-			echo ".SS $$ext"; \
-			cat "$$f"; \
-			continue; \
-		fi; \
-		f="${srcdir}/libip6t_$$ext.man"; \
+		f="${srcdir}/lib$(2)t_$$ext.man"; \
 		if [ -f "$$f" ]; then \
 			echo ".SS $$ext"; \
 			cat "$$f"; \
@@ -181,13 +175,13 @@ man_run    = \
 	done >$@;
 
 matches4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}))
+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}),ip)
 
 matches6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}),ip6)
 
 targets4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}))
+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}),ip)
 
 targets6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
-	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}))
+	$(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}),ip6)
-- 
1.6.1.3

Re: [pull] documentation fixes

[Patrick McHardy]

Jan Engelhardt wrote:
> Please pull from
> 	git://dev.medozas.de/iptables master
> 
> to receive:
> 
> 	build: trigger reconfigure when extensions/GNUmakefile.in changes
> 	doc: do not put IPv4 doc into ip6tables.8

Pulled and pushed out, thanks. Please include a full diffstat though,
that saves me from having to add up the individual diffstats manually :)

[PULL] Documentation fixes

[Jonathan Corbet]

The following changes since commit
1cb566ba5634d7593b8b2a0a5c83f1c9e14b2e09:

  scripts/kernel-doc: handle DECLARE_HASHTABLE (2017-07-03 06:57:09 -0600)

are available in the git repository at:

  git://git.lwn.net/linux.git tags/4.13-fixes

for you to fetch changes up to 51e988f4092428e3d2c9f141fba9f86583bc82f3:

  kokr/memory-barriers.txt: Fix obsolete link to atomic_ops.txt (2017-07-12 16:56:40 -0600)

----------------------------------------------------------------
A set of fixes for various warnings, including the one caused by the
removal of kernel/rcu/srcu.c.  Also correct a stray pointer in
memory-barriers.txt.

----------------------------------------------------------------
Jonathan Corbet (3):
      docs: Do not include from kernel/rcu/srcu.c
      docs: Include uaccess docs from the right file
      docs: Turn off section numbering for the input docs

SeongJae Park (2):
      memory-barriers.txt: Fix broken link to atomic_ops.txt
      kokr/memory-barriers.txt: Fix obsolete link to atomic_ops.txt

 Documentation/core-api/kernel-api.rst                |  2 +-
 Documentation/driver-api/basics.rst                  |  3 ---
 Documentation/input/index.rst                        |  1 -
 Documentation/memory-barriers.txt                    |  6 +++---
 Documentation/translations/ko_KR/memory-barriers.txt | 14 +++++++-------
 5 files changed, 11 insertions(+), 15 deletions(-)

[PULL] Documentation fixes

[Jonathan Corbet]

The following changes since commit
4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323:

  Linux 4.15-rc1 (2017-11-26 16:01:47 -0800)

are available in the Git repository at:

  git://git.lwn.net/linux.git tags/docs-4.15-fixes

for you to fetch changes up to 9956cfef3409177d9e24ea4b7910148a18073a6f:

  Documentation: fix docs build error after source file removed (2017-12-03 15:11:45 -0700)

----------------------------------------------------------------
A handful of documentation fixes.  The most significant of these addresses
a problem with the new warning mode: it can break the build when confronted
with a source file containing malformed kerneldoc comments.

----------------------------------------------------------------
John Pittman (1):
      scsi: documentation: Fix case of 'scsi_device' struct mention(s)

Jonathan Neuschäfer (1):
      genericirq.rst: Remove :c:func:`...` in code blocks

Masanari Iida (1):
      dmaengine: doc : Fix warning "Title underline too short" while make xmldocs

Randy Dunlap (1):
      Documentation: fix docs build error after source file removed

Will Deacon (1):
      scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none

 Documentation/core-api/genericirq.rst         | 16 ++++++++--------
 Documentation/driver-api/dmaengine/client.rst |  2 +-
 Documentation/driver-api/pci.rst              |  3 ---
 Documentation/scsi/scsi_mid_low_api.txt       |  6 +++---
 scripts/kernel-doc                            |  2 +-
 5 files changed, 13 insertions(+), 16 deletions(-)