From e5da2114ef7e9127a4979de60896b735cf1259f7 Mon Sep 17 00:00:00 2001 From: mmattel Date: Sun, 9 Jan 2022 20:24:58 +0100 Subject: [PATCH] Fix the family directory structure --- antora.yml | 2 +- bin/find-orphaned-adoc-files | 38 ++++++++---------- bin/find-orphaned-base | 6 ++- bin/find-orphaned-example-files | 2 + bin/find-orphaned-image-files | 3 +- bin/makepdf | 14 +++++-- .../images/accounts/android-13.png | Bin .../accounts/android-manage-accounts.jpg | Bin .../android-remove-account-confirmation.jpg | Bin .../images/accounts/manage-user-accounts.png | Bin .../images/connecting/android-2.png | Bin .../images/connecting/android-3.png | Bin .../connecting/android-all-files-overview.png | Bin .../images/document-provider/step-1.png | Bin .../images/document-provider/step-2.png | Bin .../{assets => }/images/files/android-14.png | Bin .../{assets => }/images/files/android-4.png | Bin .../{assets => }/images/files/android-6.png | Bin .../images/files/android-all-files-view.jpg | Bin .../files/android-file-list-overflow-menu.jpg | Bin .../files/android-file-overflow-menu.jpg | Bin .../images/files/current-uploads.png | Bin .../images/files/files_folders_view.png | Bin .../gif-support-owncloud-android-app.png | Bin .../images/files/multiple_share_link.png | Bin .../images/files/select-multiple-files.png | Bin ...rom-camera-owncloud-android-app-step-1.png | Bin ...rom-camera-owncloud-android-app-step-2.png | Bin ...rom-camera-owncloud-android-app-step-3.jpg | Bin .../images/files/specify-camera-folder.png | Bin .../images/installation/android-1.png | Bin ...tures-wizard-step-owncloud-android-app.png | Bin .../images/logs/log-viewer-opened.png | Bin .../images/logs/no-log-reading-app-found.png | Bin .../images/logs/select-log-reading-app.png | Bin .../images/logs/show-logs-list.png | Bin ...-enabled-disabled-owncloud-android-app.png | Bin ...-and-pattern-lock-owncloud-android-app.png | Bin .../settings/allow-light-filtering-apps.png | Bin .../android-settings-camera-upload.png | Bin .../images/settings/android-settings-page.png | Bin .../troubleshooting/mitmproxy_screenshot.png | Bin modules/ROOT/partials/.gitkeep | 0 modules/ROOT/{ => partials}/nav.adoc | 0 44 files changed, 36 insertions(+), 29 deletions(-) rename modules/ROOT/{assets => }/images/accounts/android-13.png (100%) rename modules/ROOT/{assets => }/images/accounts/android-manage-accounts.jpg (100%) rename modules/ROOT/{assets => }/images/accounts/android-remove-account-confirmation.jpg (100%) rename modules/ROOT/{assets => }/images/accounts/manage-user-accounts.png (100%) rename modules/ROOT/{assets => }/images/connecting/android-2.png (100%) rename modules/ROOT/{assets => }/images/connecting/android-3.png (100%) rename modules/ROOT/{assets => }/images/connecting/android-all-files-overview.png (100%) rename modules/ROOT/{assets => }/images/document-provider/step-1.png (100%) rename modules/ROOT/{assets => }/images/document-provider/step-2.png (100%) rename modules/ROOT/{assets => }/images/files/android-14.png (100%) rename modules/ROOT/{assets => }/images/files/android-4.png (100%) rename modules/ROOT/{assets => }/images/files/android-6.png (100%) rename modules/ROOT/{assets => }/images/files/android-all-files-view.jpg (100%) rename modules/ROOT/{assets => }/images/files/android-file-list-overflow-menu.jpg (100%) rename modules/ROOT/{assets => }/images/files/android-file-overflow-menu.jpg (100%) rename modules/ROOT/{assets => }/images/files/current-uploads.png (100%) rename modules/ROOT/{assets => }/images/files/files_folders_view.png (100%) rename modules/ROOT/{assets => }/images/files/gif-support-owncloud-android-app.png (100%) rename modules/ROOT/{assets => }/images/files/multiple_share_link.png (100%) rename modules/ROOT/{assets => }/images/files/select-multiple-files.png (100%) rename modules/ROOT/{assets => }/images/files/share-from-camera-owncloud-android-app-step-1.png (100%) rename modules/ROOT/{assets => }/images/files/share-from-camera-owncloud-android-app-step-2.png (100%) rename modules/ROOT/{assets => }/images/files/share-from-camera-owncloud-android-app-step-3.jpg (100%) rename modules/ROOT/{assets => }/images/files/specify-camera-folder.png (100%) rename modules/ROOT/{assets => }/images/installation/android-1.png (100%) rename modules/ROOT/{assets => }/images/installation/new-features-wizard-step-owncloud-android-app.png (100%) rename modules/ROOT/{assets => }/images/logs/log-viewer-opened.png (100%) rename modules/ROOT/{assets => }/images/logs/no-log-reading-app-found.png (100%) rename modules/ROOT/{assets => }/images/logs/select-log-reading-app.png (100%) rename modules/ROOT/{assets => }/images/logs/show-logs-list.png (100%) rename modules/ROOT/{assets => }/images/security/fingerprint-and-pattern-lock-enabled-disabled-owncloud-android-app.png (100%) rename modules/ROOT/{assets => }/images/security/fingerprint-and-pattern-lock-owncloud-android-app.png (100%) rename modules/ROOT/{assets => }/images/settings/allow-light-filtering-apps.png (100%) rename modules/ROOT/{assets => }/images/settings/android-settings-camera-upload.png (100%) rename modules/ROOT/{assets => }/images/settings/android-settings-page.png (100%) rename modules/ROOT/{assets => }/images/troubleshooting/mitmproxy_screenshot.png (100%) create mode 100644 modules/ROOT/partials/.gitkeep rename modules/ROOT/{ => partials}/nav.adoc (100%) diff --git a/antora.yml b/antora.yml index f2d0fff..6175ee5 100644 --- a/antora.yml +++ b/antora.yml @@ -3,7 +3,7 @@ title: Mobile App for Android version: 'next' start_page: ROOT:index.adoc nav: -- modules/ROOT/nav.adoc +- modules/ROOT/partials/nav.adoc asciidoc: attributes: diff --git a/bin/find-orphaned-adoc-files b/bin/find-orphaned-adoc-files index 51825c4..f38a680 100755 --- a/bin/find-orphaned-adoc-files +++ b/bin/find-orphaned-adoc-files @@ -1,16 +1,18 @@ #!/usr/bin/env bash # -# This script checks which .adoc files are possibly orphaned. +# This script checks which .adoc files are possibly orphaned # It can cover single and multi manual environments # # Note that filenames MUST NOT contain blanks AVAILABLE_MANUALS=( ROOT ) +# dependend of root or not, the manual name gets a postfix added, name see below ROOT_NAME="ROOT" +# all main nav files from the modules have the name nav.adoc NAV_FILENAME="nav.adoc" -NAV_ROOT_FILENAME="nav_root.adoc" -PARTIALS_NAME="_partials" +PARTIALS_NAME="partials" +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates FAMILY='{partialsdir}' #FAMILY="partial$" MANUAL_NAME= @@ -70,8 +72,13 @@ function usage() function find_orphans() { + local search_pattern= + validate_manual "$MANUAL_NAME" + # escape the dollar sign in the search pattern if exists + search_pattern="include::${FAMILY//$/\\$}" + # define the global variables # the base directory name depends if there is a single or are multiple manuals available if [[ ${MANUAL_NAME} = ${ROOT_NAME} ]]; then @@ -81,25 +88,12 @@ function find_orphans() fi # PAGES_DIR="${BASE_DIR}/pages" - # - # the nav file name and location depends if there are single or multiple manuals available - # and if the ROOT manual has been selected or not - # - # single manual - NAV_FILE="${BASE_DIR}/${NAV_FILENAME}" - # - # multi manual (overwrites the variable) - if [[ ${#AVAILABLE_MANUALS[@]} -gt 1 ]]; then - if [[ ${MANUAL_NAME} = ${ROOT_NAME} ]]; then - # ROOT selected - NAV_FILE="${BASE_DIR}/${NAV_ROOT_FILENAME}" - else - # another module selected - NAV_FILE="${PAGES_DIR}/${PARTIALS_NAME}/${NAV_FILENAME}" - fi - fi + + # define the navigation file + NAV_FILE="${BASE_DIR}/${PARTIALS_NAME}/${NAV_FILENAME}" + # --> important: the partials dir may change to base_dir/partials_name - PARTIALS_DIR="${PAGES_DIR}/${PARTIALS_NAME}" + PARTIALS_DIR="${BASE_DIR}/${PARTIALS_NAME}" # get content for all partials but exclude the nav file, however we call it # partials directory may not be present @@ -221,7 +215,7 @@ function find_orphans_for_manual() # now check if there are orphaned partials files # get all files which have an include + family statement - include_list=($(cat "${PAGES_FILES[@]/#/${PAGES_DIR}/}" | grep "include::${FAMILY}" | sort | uniq)) + include_list=($(cat "${PAGES_FILES[@]/#/${PAGES_DIR}/}" | grep "${search_pattern}" | sort | uniq)) #echo ${include_list[@]} | tr ' ' '\n' #exit diff --git a/bin/find-orphaned-base b/bin/find-orphaned-base index 61adbad..0eb6b80 100755 --- a/bin/find-orphaned-base +++ b/bin/find-orphaned-base @@ -13,6 +13,9 @@ exit fi +# escape the dollar sign in the search pattern if exists +SEARCH_PATTERN="${SEARCH_PATTERN//$/\\$}" + function start_scan() { local list @@ -92,8 +95,9 @@ function start_scan() fi # create an array diff and print to output + # the output contains the full relative path not_linked=($(echo ${found_find[@]} ${found_grep[@]} | tr ' ' '\n' | sort | uniq -u)) - echo ${not_linked[@]} | tr ' ' '\n' + echo "${not_linked[@]/#/${BASE_DIR}/${TARGET_DIR}/}" | tr ' ' '\n' # count the number of occurrences count_not_linked=$(( $count_not_linked + ${#not_linked[@]} )) diff --git a/bin/find-orphaned-example-files b/bin/find-orphaned-example-files index faea72e..a296fed 100755 --- a/bin/find-orphaned-example-files +++ b/bin/find-orphaned-example-files @@ -15,7 +15,9 @@ TASK="EXAMPLE" TARGET_DIR="examples" # depending on the target, there may be a trailing slash necessary or not # check how the file is included +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates SEARCH_PATTERN='include::{examplesdir}' +#SEARCH_PATTERN='include::example$' # get the full path the the directory the script runs DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" diff --git a/bin/find-orphaned-image-files b/bin/find-orphaned-image-files index 28bb63f..5431025 100755 --- a/bin/find-orphaned-image-files +++ b/bin/find-orphaned-image-files @@ -11,9 +11,10 @@ AVAILABLE_MANUALS=( ROOT ) ROOT_NAME="ROOT" BASE_DIR="" MANUAL_POSTFIX="_manual" -TARGET_DIR="assets/images" +TARGET_DIR="images" # depending on the target, there may be a trailing slash necessary or not # check how the file is included +# https://docs.antora.org/antora/2.3/page/resource-id/#id-coordinates SEARCH_PATTERN='image:' # get the full path the the directory the script runs diff --git a/bin/makepdf b/bin/makepdf index 467c297..f86ccc5 100755 --- a/bin/makepdf +++ b/bin/makepdf @@ -35,6 +35,9 @@ ACTUAL_BRANCH_NAME= DEFAULT_NAME="next" MASTER_BRANCH="master" +# the name of the partials directory +PARTIALS_NAME="partials" + DRY_RUN=false # get the todays date @@ -125,7 +128,7 @@ function clean_build_dir() # the nav file is handed over as parameter used as stream function convert_antora_nav_to_asciidoc_list() { - + local level_offset= local nav_filename="$1" # have a blank line between the template content end and the beginning of the inserts @@ -140,7 +143,10 @@ function convert_antora_nav_to_asciidoc_list() # on single manual repos, the level offset is corrected with 1 (NF-1) level_offset=$(echo "$line" | awk -F"*" '{print NF-1}') fi - revised_line=$(echo "$line" | sed 's/xref:/include::{module_base_path}/' | sed 's/\[.*\]//g' | sed -r 's/^\*{1,} //') + # when having multi manual repos, the last sed in the line below is to remove + # the manual component (:manual_name:) from the string + # this is because we have moved the nav.adoc file into partials and therefore need to add the module + revised_line=$(echo "$line" | sed 's/xref:/include::{module_base_path}/' | sed 's/\[.*\]//g' | sed -r 's/^\*{1,} //' | sed -e 's/\(module_base_path}\)\(.*:\)/\1/') echo "${revised_line}[leveloffset=+${level_offset}]" echo fi @@ -211,7 +217,7 @@ function build_pdf_manual() local book_file="${BOOKS_DIRECTORY}/ownCloud_${manual_infix}_Manual.adoc" # the navigation file for the manual to be built - local nav_file="modules/${source_root}/nav.adoc" + local nav_file="modules/${source_root}/${PARTIALS_NAME}/nav.adoc" # Get the dynamic list of attributes from yml files # The output after sed is a string like -a key=value -a key=value ... @@ -261,7 +267,7 @@ function build_pdf_manual() param+='-a format="pdf" ' # param+='-a experimental="" ' # experimental already set in site.yml param+='-a examplesdir='$(pwd)/modules/${source_root}/examples/' ' - param+='-a imagesdir='$(pwd)/modules/${source_root}/assets/images/' ' + param+='-a imagesdir='$(pwd)/modules/${source_root}/images/' ' param+='-a partialsdir='$(pwd)/modules/${source_root}/pages/_partials/' ' param+='-a revnumber='${branch}' ' param+='-a revdate="'${release_date}'" ' diff --git a/modules/ROOT/assets/images/accounts/android-13.png b/modules/ROOT/images/accounts/android-13.png similarity index 100% rename from modules/ROOT/assets/images/accounts/android-13.png rename to modules/ROOT/images/accounts/android-13.png diff --git a/modules/ROOT/assets/images/accounts/android-manage-accounts.jpg b/modules/ROOT/images/accounts/android-manage-accounts.jpg similarity index 100% rename from modules/ROOT/assets/images/accounts/android-manage-accounts.jpg rename to modules/ROOT/images/accounts/android-manage-accounts.jpg diff --git a/modules/ROOT/assets/images/accounts/android-remove-account-confirmation.jpg b/modules/ROOT/images/accounts/android-remove-account-confirmation.jpg similarity index 100% rename from modules/ROOT/assets/images/accounts/android-remove-account-confirmation.jpg rename to modules/ROOT/images/accounts/android-remove-account-confirmation.jpg diff --git a/modules/ROOT/assets/images/accounts/manage-user-accounts.png b/modules/ROOT/images/accounts/manage-user-accounts.png similarity index 100% rename from modules/ROOT/assets/images/accounts/manage-user-accounts.png rename to modules/ROOT/images/accounts/manage-user-accounts.png diff --git a/modules/ROOT/assets/images/connecting/android-2.png b/modules/ROOT/images/connecting/android-2.png similarity index 100% rename from modules/ROOT/assets/images/connecting/android-2.png rename to modules/ROOT/images/connecting/android-2.png diff --git a/modules/ROOT/assets/images/connecting/android-3.png b/modules/ROOT/images/connecting/android-3.png similarity index 100% rename from modules/ROOT/assets/images/connecting/android-3.png rename to modules/ROOT/images/connecting/android-3.png diff --git a/modules/ROOT/assets/images/connecting/android-all-files-overview.png b/modules/ROOT/images/connecting/android-all-files-overview.png similarity index 100% rename from modules/ROOT/assets/images/connecting/android-all-files-overview.png rename to modules/ROOT/images/connecting/android-all-files-overview.png diff --git a/modules/ROOT/assets/images/document-provider/step-1.png b/modules/ROOT/images/document-provider/step-1.png similarity index 100% rename from modules/ROOT/assets/images/document-provider/step-1.png rename to modules/ROOT/images/document-provider/step-1.png diff --git a/modules/ROOT/assets/images/document-provider/step-2.png b/modules/ROOT/images/document-provider/step-2.png similarity index 100% rename from modules/ROOT/assets/images/document-provider/step-2.png rename to modules/ROOT/images/document-provider/step-2.png diff --git a/modules/ROOT/assets/images/files/android-14.png b/modules/ROOT/images/files/android-14.png similarity index 100% rename from modules/ROOT/assets/images/files/android-14.png rename to modules/ROOT/images/files/android-14.png diff --git a/modules/ROOT/assets/images/files/android-4.png b/modules/ROOT/images/files/android-4.png similarity index 100% rename from modules/ROOT/assets/images/files/android-4.png rename to modules/ROOT/images/files/android-4.png diff --git a/modules/ROOT/assets/images/files/android-6.png b/modules/ROOT/images/files/android-6.png similarity index 100% rename from modules/ROOT/assets/images/files/android-6.png rename to modules/ROOT/images/files/android-6.png diff --git a/modules/ROOT/assets/images/files/android-all-files-view.jpg b/modules/ROOT/images/files/android-all-files-view.jpg similarity index 100% rename from modules/ROOT/assets/images/files/android-all-files-view.jpg rename to modules/ROOT/images/files/android-all-files-view.jpg diff --git a/modules/ROOT/assets/images/files/android-file-list-overflow-menu.jpg b/modules/ROOT/images/files/android-file-list-overflow-menu.jpg similarity index 100% rename from modules/ROOT/assets/images/files/android-file-list-overflow-menu.jpg rename to modules/ROOT/images/files/android-file-list-overflow-menu.jpg diff --git a/modules/ROOT/assets/images/files/android-file-overflow-menu.jpg b/modules/ROOT/images/files/android-file-overflow-menu.jpg similarity index 100% rename from modules/ROOT/assets/images/files/android-file-overflow-menu.jpg rename to modules/ROOT/images/files/android-file-overflow-menu.jpg diff --git a/modules/ROOT/assets/images/files/current-uploads.png b/modules/ROOT/images/files/current-uploads.png similarity index 100% rename from modules/ROOT/assets/images/files/current-uploads.png rename to modules/ROOT/images/files/current-uploads.png diff --git a/modules/ROOT/assets/images/files/files_folders_view.png b/modules/ROOT/images/files/files_folders_view.png similarity index 100% rename from modules/ROOT/assets/images/files/files_folders_view.png rename to modules/ROOT/images/files/files_folders_view.png diff --git a/modules/ROOT/assets/images/files/gif-support-owncloud-android-app.png b/modules/ROOT/images/files/gif-support-owncloud-android-app.png similarity index 100% rename from modules/ROOT/assets/images/files/gif-support-owncloud-android-app.png rename to modules/ROOT/images/files/gif-support-owncloud-android-app.png diff --git a/modules/ROOT/assets/images/files/multiple_share_link.png b/modules/ROOT/images/files/multiple_share_link.png similarity index 100% rename from modules/ROOT/assets/images/files/multiple_share_link.png rename to modules/ROOT/images/files/multiple_share_link.png diff --git a/modules/ROOT/assets/images/files/select-multiple-files.png b/modules/ROOT/images/files/select-multiple-files.png similarity index 100% rename from modules/ROOT/assets/images/files/select-multiple-files.png rename to modules/ROOT/images/files/select-multiple-files.png diff --git a/modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-1.png b/modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-1.png similarity index 100% rename from modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-1.png rename to modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-1.png diff --git a/modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-2.png b/modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-2.png similarity index 100% rename from modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-2.png rename to modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-2.png diff --git a/modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-3.jpg b/modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-3.jpg similarity index 100% rename from modules/ROOT/assets/images/files/share-from-camera-owncloud-android-app-step-3.jpg rename to modules/ROOT/images/files/share-from-camera-owncloud-android-app-step-3.jpg diff --git a/modules/ROOT/assets/images/files/specify-camera-folder.png b/modules/ROOT/images/files/specify-camera-folder.png similarity index 100% rename from modules/ROOT/assets/images/files/specify-camera-folder.png rename to modules/ROOT/images/files/specify-camera-folder.png diff --git a/modules/ROOT/assets/images/installation/android-1.png b/modules/ROOT/images/installation/android-1.png similarity index 100% rename from modules/ROOT/assets/images/installation/android-1.png rename to modules/ROOT/images/installation/android-1.png diff --git a/modules/ROOT/assets/images/installation/new-features-wizard-step-owncloud-android-app.png b/modules/ROOT/images/installation/new-features-wizard-step-owncloud-android-app.png similarity index 100% rename from modules/ROOT/assets/images/installation/new-features-wizard-step-owncloud-android-app.png rename to modules/ROOT/images/installation/new-features-wizard-step-owncloud-android-app.png diff --git a/modules/ROOT/assets/images/logs/log-viewer-opened.png b/modules/ROOT/images/logs/log-viewer-opened.png similarity index 100% rename from modules/ROOT/assets/images/logs/log-viewer-opened.png rename to modules/ROOT/images/logs/log-viewer-opened.png diff --git a/modules/ROOT/assets/images/logs/no-log-reading-app-found.png b/modules/ROOT/images/logs/no-log-reading-app-found.png similarity index 100% rename from modules/ROOT/assets/images/logs/no-log-reading-app-found.png rename to modules/ROOT/images/logs/no-log-reading-app-found.png diff --git a/modules/ROOT/assets/images/logs/select-log-reading-app.png b/modules/ROOT/images/logs/select-log-reading-app.png similarity index 100% rename from modules/ROOT/assets/images/logs/select-log-reading-app.png rename to modules/ROOT/images/logs/select-log-reading-app.png diff --git a/modules/ROOT/assets/images/logs/show-logs-list.png b/modules/ROOT/images/logs/show-logs-list.png similarity index 100% rename from modules/ROOT/assets/images/logs/show-logs-list.png rename to modules/ROOT/images/logs/show-logs-list.png diff --git a/modules/ROOT/assets/images/security/fingerprint-and-pattern-lock-enabled-disabled-owncloud-android-app.png b/modules/ROOT/images/security/fingerprint-and-pattern-lock-enabled-disabled-owncloud-android-app.png similarity index 100% rename from modules/ROOT/assets/images/security/fingerprint-and-pattern-lock-enabled-disabled-owncloud-android-app.png rename to modules/ROOT/images/security/fingerprint-and-pattern-lock-enabled-disabled-owncloud-android-app.png diff --git a/modules/ROOT/assets/images/security/fingerprint-and-pattern-lock-owncloud-android-app.png b/modules/ROOT/images/security/fingerprint-and-pattern-lock-owncloud-android-app.png similarity index 100% rename from modules/ROOT/assets/images/security/fingerprint-and-pattern-lock-owncloud-android-app.png rename to modules/ROOT/images/security/fingerprint-and-pattern-lock-owncloud-android-app.png diff --git a/modules/ROOT/assets/images/settings/allow-light-filtering-apps.png b/modules/ROOT/images/settings/allow-light-filtering-apps.png similarity index 100% rename from modules/ROOT/assets/images/settings/allow-light-filtering-apps.png rename to modules/ROOT/images/settings/allow-light-filtering-apps.png diff --git a/modules/ROOT/assets/images/settings/android-settings-camera-upload.png b/modules/ROOT/images/settings/android-settings-camera-upload.png similarity index 100% rename from modules/ROOT/assets/images/settings/android-settings-camera-upload.png rename to modules/ROOT/images/settings/android-settings-camera-upload.png diff --git a/modules/ROOT/assets/images/settings/android-settings-page.png b/modules/ROOT/images/settings/android-settings-page.png similarity index 100% rename from modules/ROOT/assets/images/settings/android-settings-page.png rename to modules/ROOT/images/settings/android-settings-page.png diff --git a/modules/ROOT/assets/images/troubleshooting/mitmproxy_screenshot.png b/modules/ROOT/images/troubleshooting/mitmproxy_screenshot.png similarity index 100% rename from modules/ROOT/assets/images/troubleshooting/mitmproxy_screenshot.png rename to modules/ROOT/images/troubleshooting/mitmproxy_screenshot.png diff --git a/modules/ROOT/partials/.gitkeep b/modules/ROOT/partials/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/partials/nav.adoc similarity index 100% rename from modules/ROOT/nav.adoc rename to modules/ROOT/partials/nav.adoc