Skip to content

Commit

Permalink
devguide: move into userguide as last chapter
Browse files Browse the repository at this point in the history
Moved devguide dir into userguide dir.
Since the devguide is now incorporated as the last chapter of the
userguide, removed build and configuration files from the devguide
dir, as these are no longer needed.

Task OISF#4909
  • Loading branch information
jufajardini authored and victorjulien committed Mar 29, 2022
1 parent 69c6657 commit 6f77c72
Show file tree
Hide file tree
Showing 45 changed files with 35 additions and 645 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Suricata settings as per
# doc/devguide/codebase/code-style.rst
# doc/userguide/devguide/codebase/code-style.rst
#
# This file is set up for clang 9. For the settings available, see
# https://releases.llvm.org/9.0.0/tools/clang/docs/ClangFormatStyleOptions.html
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,6 @@ jobs:
- run: make dist
- name: Checking that documentation was built
run: |
test -e doc/devguide/devguide.pdf
test -e doc/userguide/userguide.pdf
test -e doc/userguide/suricata.1
- name: Extracting suricata-verify
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2534,7 +2534,7 @@ AM_CONDITIONAL([BUILD_SHARED_LIBRARY], [test "x$enable_shared" = "xyes"] && [tes

AC_CONFIG_FILES(Makefile src/Makefile rust/Makefile rust/Cargo.toml rust/derive/Cargo.toml rust/.cargo/config)
AC_CONFIG_FILES(qa/Makefile qa/coccinelle/Makefile)
AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile doc/devguide/Makefile)
AC_CONFIG_FILES(rules/Makefile doc/Makefile doc/userguide/Makefile)
AC_CONFIG_FILES(contrib/Makefile contrib/file_processor/Makefile contrib/file_processor/Action/Makefile contrib/file_processor/Processor/Makefile)
AC_CONFIG_FILES(suricata.yaml etc/Makefile etc/suricata.logrotate etc/suricata.service)
AC_CONFIG_FILES(python/Makefile python/suricata/config/defaults.py)
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS = userguide devguide
SUBDIRS = userguide

EXTRA_DIST = \
AUTHORS \
Expand Down
73 changes: 0 additions & 73 deletions doc/devguide/Makefile.am

This file was deleted.

204 changes: 0 additions & 204 deletions doc/devguide/Makefile.sphinx

This file was deleted.

Empty file removed doc/devguide/_static/.gitignore
Empty file.
27 changes: 0 additions & 27 deletions doc/devguide/_static/css/suricata.css

This file was deleted.

Loading

0 comments on commit 6f77c72

Please sign in to comment.