Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/robin/remove-zeek-docs'
Browse files Browse the repository at this point in the history
* origin/topic/robin/remove-zeek-docs:
  Remove Zeek-specific documentation.
  • Loading branch information
rsmmr committed Oct 13, 2023
2 parents eda2373 + 2b92da5 commit 80cdec5
Show file tree
Hide file tree
Showing 30 changed files with 48 additions and 2,420 deletions.
12 changes: 12 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
1.9.0-dev.146 | 2023-10-13 12:26:24 +0200

* Remove Zeek-specific documentation. (Robin Sommer, Corelight)

This now lives Zeek-side.

This keeps the section structure so that we make things easier to
find, and put in pointers to the new Zeek-side documentation

It leaves everything in the development section as is; hard to piece
apart and seems fine to leave it here.

1.9.0-dev.144 | 2023-10-13 11:47:35 +0200

* GH-1571: Remove trimming inside individual chunks. (Benjamin Bannier, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.0-dev.144
1.9.0-dev.146
13 changes: 0 additions & 13 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,5 @@ doxygen:
check:
@$(SPHINXBUILD) -q -b linkcheck $(SOURCEDIR) $(DESTDIR)/linkcheck


spicy-%:
git clone https://github.com/zeek/$@
zeek:
git clone https://github.com/zeek/zeek --depth 1

check-zeek-docs: spicy-tftp zeek
@echo Refreshing checkouts
@for REPO in $^; do (cd $$REPO && git pull && git reset HEAD --hard)>/dev/null; done
@
@echo Checking whether docs for Zeek integration are up-to-date
@./scripts/autogen-zeek-docs zeek spicy-tftp
@
@git diff --quiet autogen/zeek \
|| (echo "Zeek docs are not up-to-date, rerun './scripts/autogen-zeek-docs'." && exit 1)
1 change: 0 additions & 1 deletion doc/_static/record-spicy-batch.zeek

This file was deleted.

File renamed without changes.
38 changes: 0 additions & 38 deletions doc/autogen/zeek/init-bare.zeek

This file was deleted.

81 changes: 0 additions & 81 deletions doc/autogen/zeek/init-framework.zeek

This file was deleted.

90 changes: 0 additions & 90 deletions doc/autogen/zeek/record-spicy-batch.zeek

This file was deleted.

16 changes: 0 additions & 16 deletions doc/autogen/zeek/tftp.evt

This file was deleted.

92 changes: 0 additions & 92 deletions doc/autogen/zeek/tftp.spicy

This file was deleted.

Loading

0 comments on commit 80cdec5

Please sign in to comment.