[WIP] Gracefully shutdown old process with SIGUSR2

2017-02-09 22:51:17 +09:00
513 changed files with 35060 additions and 71412 deletions
--- a/.clang-format
+++ b/.clang-format
@ -2,190 +2,93 @@
 Language:        Cpp
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
+AlignConsecutiveAssignments: false
-AlignConsecutiveMacros: None
+AlignConsecutiveDeclarations: false
-AlignConsecutiveAssignments: None
+AlignEscapedNewlinesLeft: false
-AlignConsecutiveBitFields: None
+AlignOperands:   true
 AlignConsecutiveDeclarations: None
 AlignEscapedNewlines: Right
 AlignOperands:   Align
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: false
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
+AlwaysBreakTemplateDeclarations: false
 AttributeMacros:
  - __capability
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
  AfterCaseLabel:  false
  AfterClass:      false
-  AfterControlStatement: Never
+  AfterControlStatement: false
  AfterEnum:       false
  AfterFunction:   false
  AfterNamespace:  false
  AfterObjCDeclaration: false
  AfterStruct:     false
  AfterUnion:      false
  AfterExternBlock: false
  BeforeCatch:     false
  BeforeElse:      false
  BeforeLambdaBody: false
  BeforeWhile:     false
  IndentBraces:    false
  SplitEmptyFunction: true
  SplitEmptyRecord: true
  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: true
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
-QualifierAlignment: Leave
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
-PackConstructorInitializers: NextLine
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 BasedOnStyle:    ''
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: true
 ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
 IfMacros:
  - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
    Priority:        2
    SortPriority:    0
    CaseSensitive:   false
  - Regex:           '^(<|"(gtest|isl|json)/)'
    Priority:        3
    SortPriority:    0
    CaseSensitive:   false
  - Regex:           '.*'
    Priority:        1
    SortPriority:    0
    CaseSensitive:   false
 IncludeIsMainRegex: '$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
 IndentCaseLabels: false
 IndentCaseBlocks: false
 IndentGotoLabels: true
 IndentPPDirectives: AfterHash
 IndentExternBlock: AfterExternBlock
 IndentRequires:  false
 IndentWidth:     2
 IndentWrappedFunctionNames: false
 InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 LambdaBodyIndentation: Signature
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
 PointerAlignment: Right
 PPIndentWidth:   -1
 ReferenceAlignment: Pointer
 ReflowComments:  true
-RemoveBracesLLVM: false
+SortIncludes:    false
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 1
 SortIncludes:    Never
 SortJavaStaticImport: Before
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeParensOptions:
  AfterControlStatements: true
  AfterForeachMacros: true
  AfterFunctionDefinitionName: false
  AfterFunctionDeclarationName: false
  AfterIfMacros:   true
  AfterOverloadedOperator: false
  BeforeNonEmptyParentheses: false
 SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
+SpacesInAngles:  false
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInLineCommentPrefix:
  Minimum:         1
  Maximum:         -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
+Standard:        Cpp11
 BitFieldColonSpacing: Both
 Standard:        Latest
 StatementAttributeLikeMacros:
  - Q_EMIT
 StatementMacros:
  - Q_UNUSED
  - QT_REQUIRE_VERSION
 TabWidth:        8
 UseCRLF:         false
 UseTab:          Never
 WhitespaceSensitiveMacros:
  - STRINGIZE
  - PP_STRINGIZE
  - BOOST_PP_STRINGIZE
  - NS_SWIFT_NAME
  - CF_SWIFT_NAME
 ...
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,291 +0,0 @@
 name: build
 on: [push, pull_request]
 jobs:
  build:
    strategy:
      matrix:
        os: [ubuntu-22.04, macos-11]
        compiler: [gcc, clang]
        buildtool: [autotools, cmake]
        http3: [http3, no-http3]
        openssl: [openssl1, openssl3, boringssl]
        exclude:
        - os: macos-11
          openssl: openssl3
        - http3: no-http3
          openssl: openssl3
        - os: macos-11
          compiler: gcc
        - # disable macos cmake because of include path issue
          os: macos-11
          buildtool: cmake
        - os: macos-11
          openssl: boringssl
        - openssl: boringssl
          buildtool: cmake
        - openssl: boringssl
          compiler: gcc
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v3
    - name: Linux setup
      if: runner.os == 'Linux'
      run: |
        sudo apt-get install \
          g++-12 \
          clang-14 \
          autoconf \
          automake \
          autotools-dev \
          libtool \
          pkg-config \
          zlib1g-dev \
          libcunit1-dev \
          libssl-dev \
          libxml2-dev \
          libev-dev \
          libevent-dev \
          libjansson-dev \
          libjemalloc-dev \
          libc-ares-dev \
          libelf-dev \
          cmake \
          cmake-data
        echo 'CPPFLAGS=-fsanitize=address,undefined -fno-sanitize-recover=undefined -g' >> $GITHUB_ENV
        echo 'LDFLAGS=-fsanitize=address,undefined -fno-sanitize-recover=undefined' >> $GITHUB_ENV
    - name: MacOS setup
      if: runner.os == 'macOS'
      run: |
        brew install \
          libev \
          libevent \
          c-ares \
          cunit \
          libressl \
          autoconf \
          automake \
          pkg-config \
          libtool
        echo 'PKG_CONFIG_PATH=/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig' >> $GITHUB_ENV
    - name: Setup clang (Linux)
      if: runner.os == 'Linux' && matrix.compiler == 'clang'
      run: |
        echo 'CC=clang-14' >> $GITHUB_ENV
        echo 'CXX=clang++-14' >> $GITHUB_ENV
    - name: Setup clang (MacOS)
      if: runner.os == 'macOS' && matrix.compiler == 'clang'
      run: |
        echo 'CC=clang' >> $GITHUB_ENV
        echo 'CXX=clang++' >> $GITHUB_ENV
    - name: Setup gcc (Linux)
      if: runner.os == 'Linux' && matrix.compiler == 'gcc'
      run: |
        echo 'CC=gcc-12' >> $GITHUB_ENV
        echo 'CXX=g++-12' >> $GITHUB_ENV
    - name: Setup gcc (MacOS)
      if: runner.os == 'macOS' && matrix.compiler == 'gcc'
      run: |
        echo 'CC=gcc' >> $GITHUB_ENV
        echo 'CXX=g++' >> $GITHUB_ENV
    - name: Build libbpf
      if: matrix.http3 == 'http3' && matrix.compiler == 'clang' && runner.os == 'Linux'
      run: |
        git clone -b v1.0.1 https://github.com/libbpf/libbpf
        cd libbpf
        PREFIX=$PWD/build make -C src install
        EXTRA_AUTOTOOLS_OPTS="--with-libbpf"
        EXTRA_CMAKE_OPTS="-DWITH_LIBBPF=1"
        echo 'EXTRA_AUTOTOOLS_OPTS='"$EXTRA_AUTOTOOLS_OPTS" >> $GITHUB_ENV
        echo 'EXTRA_CMAKE_OPTS='"$EXTRA_CMAKE_OPTS" >> $GITHUB_ENV
    - name: Build quictls/openssl v1.1.1
      if: matrix.http3 == 'http3' && matrix.openssl == 'openssl1'
      run: |
        git clone --depth 1 -b OpenSSL_1_1_1s+quic https://github.com/quictls/openssl
        cd openssl
        ./config --prefix=$PWD/build
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
        make install_sw
    - name: Build quictls/openssl v3.0.x
      if: matrix.http3 == 'http3' && matrix.openssl == 'openssl3'
      run: |
        unset CPPFLAGS
        unset LDFLAGS
        git clone --depth 1 -b openssl-3.0.7+quic https://github.com/quictls/openssl
        cd openssl
        ./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
        make install_sw
    - name: Build BoringSSL
      if: matrix.openssl == 'boringssl'
      run: |
        git clone https://boringssl.googlesource.com/boringssl
        cd boringssl
        git checkout 31bad2514d21f6207f3925ba56754611c462a873
        mkdir build
        cd build
        cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
        cd ..
        OPENSSL_CFLAGS="-I$PWD/include/"
        OPENSSL_LIBS="-L$PWD/build/ssl -lssl -L$PWD/build/crypto -lcrypto -pthread"
        EXTRA_NGTCP2_OPTS="$EXTRA_NGTCP2_OPTS --without-openssl --with-boringssl"
        EXTRA_AUTOTOOLS_OPTS="$EXTRA_AUTOTOOLS_OPTS --without-neverbleed --without-jemalloc"
        echo 'OPENSSL_CFLAGS='"$OPENSSL_CFLAGS" >> $GITHUB_ENV
        echo 'OPENSSL_LIBS='"$OPENSSL_LIBS" >> $GITHUB_ENV
        echo 'BORINGSSL_CFLAGS='"$OPENSSL_CFLAGS" >> $GITHUB_ENV
        echo 'BORINGSSL_LIBS='"$OPENSSL_LIBS" >> $GITHUB_ENV
        echo 'EXTRA_NGTCP2_OPTS='"$EXTRA_NGTCP2_OPTS" >> "$GITHUB_ENV"
        echo 'EXTRA_AUTOTOOLS_OPTS='"$EXTRA_AUTOTOOLS_OPTS" >> $GITHUB_ENV
    - name: Build nghttp3
      if: matrix.http3 == 'http3'
      run: |
        git clone --depth 1 -b v0.8.0 https://github.com/ngtcp2/nghttp3
        cd nghttp3
        autoreconf -i
        ./configure --prefix=$PWD/build --enable-lib-only
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
        make install
    - name: Build ngtcp2
      if: matrix.http3 == 'http3'
      run: |
        git clone --depth 1 -b v0.12.0 https://github.com/ngtcp2/ngtcp2
        cd ngtcp2
        autoreconf -i
        ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" $EXTRA_NGTCP2_OPTS
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
        make install
    - name: Setup extra environment variables for HTTP/3
      if: matrix.http3 == 'http3'
      run: |
        PKG_CONFIG_PATH="$PWD/openssl/build/lib/pkgconfig:$PWD/nghttp3/build/lib/pkgconfig:$PWD/ngtcp2/build/lib/pkgconfig:$PWD/libbpf/build/lib64/pkgconfig:$PKG_CONFIG_PATH"
        LDFLAGS="$LDFLAGS -Wl,-rpath,$PWD/openssl/build/lib -Wl,-rpath,$PWD/libbpf/build/lib64"
        EXTRA_AUTOTOOLS_OPTS="--enable-http3 $EXTRA_AUTOTOOLS_OPTS"
        EXTRA_CMAKE_OPTS="-DENABLE_HTTP3=1 $EXTRA_CMAKE_OPTS"
        echo 'PKG_CONFIG_PATH='"$PKG_CONFIG_PATH" >> $GITHUB_ENV
        echo 'LDFLAGS='"$LDFLAGS" >> $GITHUB_ENV
        echo 'EXTRA_AUTOTOOLS_OPTS='"$EXTRA_AUTOTOOLS_OPTS" >> $GITHUB_ENV
        echo 'EXTRA_CMAKE_OPTS='"$EXTRA_CMAKE_OPTS" >> $GITHUB_ENV
    - name: Setup git submodules
      run: |
        git submodule update --init
    - name: Configure autotools
      run: |
        autoreconf -i
        ./configure
    - name: Configure cmake (Linux)
      if: matrix.buildtool == 'cmake' && runner.os == 'Linux'
      run: |
        make dist
        VERSION=$(grep PACKAGE_VERSION config.h | cut -d' ' -f3 | tr -d '"')
        tar xf nghttp2-$VERSION.tar.gz
        cd nghttp2-$VERSION
        echo 'NGHTTP2_CMAKE_DIR='"$PWD" >> $GITHUB_ENV
        cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DENABLE_APP=1 $EXTRA_CMAKE_OPTS -DCPPFLAGS="$CPPFLAGS" -DLDFLAGS="$LDFLAGS" .
    - name: Configure cmake (MacOS)
      if: matrix.buildtool == 'cmake' && runner.os == 'macOS'
      run: |
        make dist
        VERSION=$(grep PACKAGE_VERSION config.h | cut -d' ' -f3 | tr -d '"')
        tar xf nghttp2-$VERSION.tar.gz
        cd nghttp2-$VERSION
        echo 'NGHTTP2_CMAKE_DIR='"$PWD" >> $GITHUB_ENV
        # This fixes infamous 'stdio.h not found' error.
        echo 'SDKROOT='"$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
        cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DENABLE_APP=1 $EXTRA_CMAKE_OPTS -DCPPFLAGS="$CPPFLAGS" -DLDFLAGS="$LDFLAGS" .
    - name: Build nghttp2 with autotools (Linux)
      if: matrix.buildtool == 'autotools' && runner.os == 'Linux'
      run: |
        make -j"$(nproc)" distcheck \
          DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --with-libev --enable-werror $EXTRA_AUTOTOOLS_OPTS CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\""
    - name: Build nghttp2 with autotools (MacOS)
      if: matrix.buildtool == 'autotools' && runner.os == 'macOS'
      run: |
        make -j"$(sysctl -n hw.ncpu)" distcheck \
          DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-libev --enable-werror $EXTRA_AUTOTOOLS_OPTS CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\""
    - name: Build nghttp2 with cmake
      if: matrix.buildtool == 'cmake'
      run: |
        cd $NGHTTP2_CMAKE_DIR
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
        make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" check
    - name: Integration test
      # Integration tests for nghttpx; autotools erases build
      # artifacts.
      if: matrix.buildtool == 'cmake'
      run: |
        cd $NGHTTP2_CMAKE_DIR/integration-tests
        make itprep it
  build-cross:
    strategy:
      matrix:
        host: [x86_64-w64-mingw32, i686-w64-mingw32]
    runs-on: ubuntu-22.04
    env:
      HOST: ${{ matrix.host }}
    steps:
    - uses: actions/checkout@v3
    - name: Linux setup
      run: |
        sudo dpkg --add-architecture i386
        sudo apt-get update
        sudo apt-get install \
          gcc-mingw-w64 \
          autoconf \
          automake \
          autotools-dev \
          libtool \
          pkg-config \
          wine
    - name: Build CUnit
      run: |
        curl -LO https://jaist.dl.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2
        tar xf CUnit-2.1-3.tar.bz2
        cd CUnit-2.1-3
        ./bootstrap
        ./configure --disable-shared --host="$HOST" --prefix="$PWD/build"
        make -j$(nproc) install
    - name: Configure autotools
      run: |
        autoreconf -i && \
        ./configure --enable-werror --enable-lib-only --with-cunit \
          --host="$HOST" PKG_CONFIG_PATH="$PWD/CUnit-2.1-3/build/lib/pkgconfig"
    - name: Build nghttp2
      run: |
        make -j$(nproc)
        make -j$(nproc) check TESTS=""
    - name: Run tests
      if: matrix.host == 'x86_64-w64-mingw32'
      run: |
        cd tests
        wine main.exe
  build-windows:
    runs-on: windows-latest
    steps:
    - uses: actions/checkout@v3
    - name: Configure cmake
      run: |
        mkdir build
        cd build
        cmake ..
    - name: Build nghttp2
      run: |
        cmake --build build
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@ -1,23 +0,0 @@
 name: CIFuzz
 on: [pull_request]
 jobs:
  Fuzzing:
    runs-on: ubuntu-latest
    steps:
    - name: Build Fuzzers
      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
      with:
        oss-fuzz-project-name: 'nghttp2'
        dry-run: false
    - name: Run Fuzzers
      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
      with:
        oss-fuzz-project-name: 'nghttp2'
        fuzz-seconds: 600
        dry-run: false
    - name: Upload Crash
      uses: actions/upload-artifact@v1
      if: failure()
      with:
        name: artifacts
        path: ./out/artifacts
--- a/.gitignore
+++ b/.gitignore
@ -54,6 +54,4 @@ _VC_ROOT/
 .depend.MSVC
 *.pyd
 *.egg-info/
-
+python/nghttp2.c
 release
 libnghttp2.lha
--- a/.gitmodules
+++ b/.gitmodules
@ -3,5 +3,4 @@
 	url = https://github.com/mruby/mruby
 [submodule "third-party/neverbleed"]
 	path = third-party/neverbleed
-	url = https://github.com/tatsuhiro-t/neverbleed.git
+	url = https://github.com/h2o/neverbleed.git
 	branch = openssl111fix
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,65 @@
 env:
  matrix:
    - CI_BUILD=cmake
    - CI_BUILD=autotools
 language: cpp
 compiler:
  - clang
  - gcc
 sudo: false
 addons:
  apt:
    sources:
    - ubuntu-toolchain-r-test
    - george-edison55-precise-backports
    packages:
    - g++-4.9
    - libstdc++-4.9-dev
    - autoconf
    - automake
    - autotools-dev
    - libtool
    - pkg-config
    - zlib1g-dev
    - libcunit1-dev
    - libssl-dev
    - libxml2-dev
    - libev-dev
    - libevent-dev
    - libjansson-dev
    - libjemalloc-dev
    - libc-ares-dev
    - cmake
    - cmake-data
 before_install:
  - $CC --version
  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
  - $CC --version
  - go version
  - cmake --version
 before_script:
  # First build spdylay, since integration tests require it.
  # spdylay is going to be built under third-party/spdylay
  - cd third-party
  - git clone https://github.com/tatsuhiro-t/spdylay.git
  - cd spdylay
  - autoreconf -i
  # Don't use ASAN for spdylay since failmalloc does not work with it.
  - ./configure --disable-src --disable-examples
  - make check
  - export SPDYLAY_HOME=$PWD
  - cd ../..
  # Now build nghttp2
  - if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
  - git submodule update --init
  - if [ "$CI_BUILD" = "autotools" ]; then ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay" CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address; fi
  - if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DSPDYLAY_INCLUDE_DIR="$SPDYLAY_HOME/lib/includes" -DSPDYLAY_LIBRARY="$SPDYLAY_HOME/lib/.libs/libspdylay.so"; fi
 script:
  - if [ "$CI_BUILD" = "autotools" ]; then make distcheck; fi
  - if [ "$CI_BUILD" = "cmake" ]; then make check; fi
  # As of April, 23, 2016, golang http2 build fails, probably because
  # the default go version is too old.
  # - cd integration-tests
  # - export GOPATH="$PWD/integration-tests/golang"
  # - make itprep
  # - make it
--- a/62
+++ b/62
@ -14,61 +14,32 @@ github issues [2].
 --------
 187j3x1
 Adam Gołębiowski
 Alek Storm
 Alex Nalivko
 Alexandros Konstantinakis-Karmis
 Alexis La Goutte
 Amir Livneh
 Amir Pakdel
 Anders Bakken
 Andreas Pohl
 Andrew Penkrat
 Andy Davies
 Angus Gratton
 Anna Henningsen
 Ant Bryan
 Asra Ali
 Benedikt Christoph Wolters
 Benjamin Peterson
 Bernard Spil
 Brendan Heinonen
 Brian Card
 Brian Suh
 Daniel Bevenius
 Daniel Evers
 Daniel Stenberg
 Dave Reisner
 David Beitey
 David Korczynski
 David Weekly
 Dimitris Apostolou
 Dmitri Tikhonov
 Dmitriy Vetutnev
 Don
 Dylan Plecki
 Etienne Cimon
 Fabian Möller
 Fabian Wiesel
 Gabi Davar
 Gaël PORTAY
 Geoff Hill
 George Liu
 Gitai
 Google Inc.
 Hajime Fujita
 Jacky Tian
 Jacky_Yin
 Jacob Champion
 James M Snell
 Jan Kundrát
 Jan-E
 Janusz Dziemidowicz
 Jay Satiro
 Jeff 'Raid' Baitis
 Jianqing Wang
 Jim Morrison
 Josh Braegger
 José F. Calcerrada
 Kamil Dudka
 Kazuho Oku
@ -76,78 +47,45 @@ Kenny (kang-yen) Peng
 Kenny Peng
 Kit Chan
 Kyle Schomp
 LazyHamster
 Leo Neat
 Lorenz Nickel
 Lucas Pardue
 MATSUMOTO Ryosuke
 Marc Bachmann
 Marcelo Trylesinski
 Matt Rudary
 Matt Way
 Michael Kaufmann
 Mike Conlen
 Mike Frysinger
 Mike Lothian
 Nicholas Hurley
 Nora Shoemaker
 Paweł Wegner
 Pedro Santos
 Peeyush Aggarwal
 Peter Wu
 Piotr Sikora
 PufferOverflow
 Raul Gutierrez Segales
 Remo E
 Renaud
 Reza Tavakoli
 Richard Wolfert
 Rick Lei
 Ross Smith II
 Rudi Heitbaum
 Ryo Ota
 Scott Mitchell
 Sebastiaan Deckers
 Shelley Vohr
 Simon Frankenberger
 Simone Basso
 Soham Sinha
 Stefan Eissing
 Stephen Ludin
 Sunpoet Po-Chuan Hsieh
 Svante Signell
 Syohei YOSHIDA
 Tapanito
 Tatsuhiko Kubo
 Tatsuhiro Tsujikawa
 Tobias Geerinckx-Rice
 Tom Harwood
 Tomas Krizek
 Tomasz Buchert
 Tomasz Torcz
 Vernon Tang
 Viacheslav Biriukov
 Viktor Szakats
 Viktor Szépe
 Wenfeng Liu
 William A Rowe Jr
 Xiaoguang Sun
 Zhuoyun Wei
 acesso
 ayanamist
 bxshi
 clemahieu
 dalf
 dawg
 es
 fangdingjun
 jwchoi
 kumagi
 lhuang04
 lstefani
 makovich
 mod-h2-dev
 moparisthebest
 robaho
 snnn
 yuuki-kodama
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -24,15 +24,15 @@
 cmake_minimum_required(VERSION 3.0)
 # XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.51.90)
+project(nghttp2 VERSION 1.19.90)
 # See versioning rule:
-#  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+#  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(LT_CURRENT  38)
+set(LT_CURRENT  26)
-set(LT_REVISION 1)
+set(LT_REVISION 4)
-set(LT_AGE      24)
+set(LT_AGE      12)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(Version)
 math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
@ -52,46 +52,44 @@ endif()
 include(GNUInstallDirs)
-# For documentation
+# For Python bindings and documentation
-find_package(Python3 COMPONENTS Interpreter)
+# (Must be called before PythonLibs for matching versions.)
 find_package(PythonInterp)
 # Auto-detection of features that can be toggled
 find_package(OpenSSL 1.0.1)
 find_package(Libev 4.11)
 find_package(Libcares 1.7.5)
 find_package(ZLIB 1.2.3)
 find_package(Libngtcp2 0.0.0)
 find_package(Libngtcp2_crypto_openssl 0.0.0)
 if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
  set(HAVE_LIBNGTCP2_CRYPTO_OPENSSL 1)
 endif()
 find_package(Libnghttp3 0.0.0)
 if(WITH_LIBBPF)
  find_package(Libbpf 0.4.0)
  if(NOT LIBBPF_FOUND)
    message(FATAL_ERROR "libbpf was requested (WITH_LIBBPF=1) but not found.")
  endif()
 endif()
 if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
  set(ENABLE_APP_DEFAULT ON)
 else()
  set(ENABLE_APP_DEFAULT OFF)
 endif()
 find_package(Systemd 209)
 find_package(Jansson  2.5)
 set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
-find_package(Libevent 2.0.8 COMPONENTS core extra openssl)
+find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
 set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
 find_package(Cython)
 find_package(PythonLibs)
 if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
  set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
 else()
  set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
 endif()
-find_package(LibXml2 2.6.26)
+find_package(LibXml2 2.7.7)
 set(WITH_LIBXML2_DEFAULT    ${LIBXML2_FOUND})
 find_package(Jemalloc)
 set(WITH_JEMALLOC_DEFAULT   ${JEMALLOC_FOUND})
 find_package(Spdylay 1.3.2)
 set(WITH_SPDYLAY_DEFAULT    ${SPDYLAY_FOUND})
 include(CMakeOptions.txt)
-if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES))
+if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
  ENABLE_PYTHON_BINDINGS))
  # Remember when disabled options are disabled for later diagnostics.
  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
 else()
@ -101,6 +99,7 @@ if(ENABLE_LIB_ONLY)
  set(ENABLE_APP            OFF)
  set(ENABLE_HPACK_TOOLS    OFF)
  set(ENABLE_EXAMPLES       OFF)
  set(ENABLE_PYTHON_BINDINGS OFF)
 endif()
 # Do not disable assertions based on CMAKE_BUILD_TYPE.
@ -111,14 +110,24 @@ foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
  endforeach()
 endforeach()
 #
 # If we're running GCC or clang define _U_ to be "__attribute__((unused))"
 # so we can use _U_ to flag unused function parameters and not get warnings
 # about them. Otherwise, define _U_ to be an empty string so that _U_ used
 # to flag an unused function parameters will compile with other compilers.
 #
 # XXX - similar hints for other compilers?
 #
 if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
  set(HINT_UNUSED_PARAM   "__attribute__((unused))")
  set(HINT_NORETURN       "__attribute__((noreturn))")
 else()
  set(HINT_UNUSED_PARAM)
  set(HINT_NORETURN)
 endif()
 include(ExtractValidFlags)
-foreach(_cxx1x_flag -std=c++14)
+foreach(_cxx1x_flag -std=c++11 -std=c++0x)
  extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
  if(_cxx1x_flag_supported)
    set(CXX1XCXXFLAGS ${_cxx1x_flag})
@ -146,6 +155,20 @@ cmake_pop_check_state()
 # Additional libraries required for programs under src directory.
 set(APP_LIBRARIES)
 if(ENABLE_PYTHON_BINDINGS)
  if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
    message(FATAL_ERROR "python bindings were requested "
      "(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
  endif()
  if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
    message(FATAL_ERROR
      "Python executable and library must have the same version!"
      " Found Python ${PYTHON_VERSION_STRING} and"
      " PythonLibs ${PYTHONLIBS_VERSION_STRING}"
    )
  endif()
 endif()
 set(CMAKE_THREAD_PREFER_PTHREAD 1)
 find_package(Threads)
 if(CMAKE_USE_PTHREADS_INIT)
@ -155,7 +178,7 @@ endif()
 # case "$host" in
 #   *android*)
 #     android_build=yes
-#     # android does not need -pthread, but needs following 3 libs for C++
+#     # android does not need -pthread, but needs followng 3 libs for C++
 #     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
 # dl: openssl requires libdl when it is statically linked.
@ -170,21 +193,9 @@ if(HAVE_CUNIT)
 endif()
 # openssl (for src)
 include(CheckSymbolExists)
 set(HAVE_OPENSSL    ${OPENSSL_FOUND})
 if(OPENSSL_FOUND)
  set(OPENSSL_INCLUDE_DIRS  ${OPENSSL_INCLUDE_DIR})
  cmake_push_check_state()
  set(CMAKE_REQUIRED_INCLUDES   "${OPENSSL_INCLUDE_DIR}")
  set(CMAKE_REQUIRED_LIBRARIES  "${OPENSSL_LIBRARIES}")
  if(WIN32)
    set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}" "ws2_32" "bcrypt")
  endif()
  check_symbol_exists(SSL_is_quic "openssl/ssl.h" HAVE_SSL_IS_QUIC)
  if(NOT HAVE_SSL_IS_QUIC)
    message(WARNING "OpenSSL in ${OPENSSL_LIBRARIES} does not have SSL_is_quic.  HTTP/3 support cannot be enabled")
  endif()
  cmake_pop_check_state()
 else()
  set(OPENSSL_INCLUDE_DIRS  "")
  set(OPENSSL_LIBRARIES     "")
@ -192,7 +203,6 @@ endif()
 # libev (for src)
 set(HAVE_LIBEV      ${LIBEV_FOUND})
 set(HAVE_ZLIB       ${ZLIB_FOUND})
 set(HAVE_SYSTEMD    ${SYSTEMD_FOUND})
 set(HAVE_LIBEVENT_OPENSSL ${LIBEVENT_FOUND})
 if(LIBEVENT_FOUND)
  # Must both link the core and openssl libraries.
@ -218,19 +228,11 @@ else()
 endif()
 # jemalloc
 set(HAVE_JEMALLOC   ${JEMALLOC_FOUND})
 # spdylay (for src/nghttpx and src/h2load)
 set(HAVE_SPDYLAY    ${SPDYLAY_FOUND})
-# libbpf (for bpf)
+if(ENABLE_ASIO_LIB)
-set(HAVE_LIBBPF ${LIBBPF_FOUND})
+  find_package(Boost 1.54.0 REQUIRED system thread)
 if(LIBBPF_FOUND)
  set(BPFCFLAGS -Wall -O2 -g)
  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
    # For Debian/Ubuntu
    set(EXTRABPFCFLAGS -I/usr/include/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
  endif()
  check_c_source_compiles("
 #include <linux/bpf.h>
 int main() { enum bpf_stats_type foo; (void)foo; }" HAVE_BPF_STATS_TYPE)
 endif()
 # The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL and libev
@ -238,24 +240,18 @@ if(ENABLE_APP AND NOT (ZLIB_FOUND AND OPENSSL_FOUND AND LIBEV_FOUND))
  message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
 endif()
 # HTTP/3 requires quictls/openssl, libngtcp2, libngtcp2_crypto_openssl
 # and libnghttp3.
 if(ENABLE_HTTP3 AND NOT (HAVE_SSL_IS_QUIC AND LIBNGTCP2_FOUND AND LIBNGTCP2_CRYPTO_OPENSSL_FOUND AND LIBNGHTTP3_FOUND))
  message(FATAL_ERROR "HTTP/3 was requested (ENABLE_HTTP3=1) but dependencies are not met.")
 endif()
 # HPACK tools requires jansson
 if(ENABLE_HPACK_TOOLS AND NOT HAVE_JANSSON)
  message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
 endif()
-# examples
+# C++ library libnghttp2_asio
 if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
  message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
 endif()
 # third-party http-parser only be built when needed
-if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS)
+if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
  set(ENABLE_THIRD_PARTY 1)
  # mruby (for src/nghttpx)
  set(HAVE_MRUBY      ${WITH_MRUBY})
@ -316,7 +312,6 @@ check_type_size("time_t"  SIZEOF_TIME_T)
 include(CheckFunctionExists)
 check_function_exists(_Exit     HAVE__EXIT)
 check_function_exists(accept4   HAVE_ACCEPT4)
 check_function_exists(mkostemp  HAVE_MKOSTEMP)
 include(CheckSymbolExists)
 # XXX does this correctly detect initgroups (un)availability on cygwin?
@ -399,15 +394,6 @@ else()
  )
 endif()
 if(ENABLE_STATIC_CRT)
  foreach(lang C CXX)
    foreach(suffix "" _DEBUG _MINSIZEREL _RELEASE _RELWITHDEBINFO)
      set(var "CMAKE_${lang}_FLAGS${suffix}")
      string(REPLACE "/MD" "/MT" ${var} "${${var}}")
    endforeach()
  endforeach()
 endif()
 if(ENABLE_DEBUG)
  set(DEBUGBUILD 1)
 endif()
@ -439,6 +425,8 @@ set(sbindir         "${CMAKE_INSTALL_FULL_SBINDIR}")
 foreach(name
   lib/libnghttp2.pc
   lib/includes/nghttp2/nghttp2ver.h
   src/libnghttp2_asio.pc
   python/setup.py
   integration-tests/config.go
   integration-tests/setenv
   doc/conf.py
@ -449,24 +437,24 @@ foreach(name
   doc/tutorial-hpack.rst
   doc/nghttpx-howto.rst
   doc/h2load-howto.rst
   doc/libnghttp2_asio.rst
   doc/python-apiref.rst
   doc/building-android-binary.rst
   doc/nghttp2.h.rst
   doc/nghttp2ver.h.rst
   doc/asio_http2.h.rst
   doc/asio_http2_server.h.rst
   doc/asio_http2_client.h.rst
   doc/contribute.rst
 )
  configure_file("${name}.in" "${name}" @ONLY)
 endforeach()
 if(APPLE)
  add_definitions(-D__APPLE_USE_RFC_3542)
 endif()
 include_directories(
  "${CMAKE_CURRENT_BINARY_DIR}" # for config.h
 )
 # For use in src/CMakeLists.txt
 set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
 set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}")
 install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
@ -474,16 +462,15 @@ add_subdirectory(lib)
 #add_subdirectory(lib/includes)
 add_subdirectory(third-party)
 add_subdirectory(src)
 #add_subdirectory(src/includes)
 add_subdirectory(examples)
 add_subdirectory(python)
 add_subdirectory(tests)
 #add_subdirectory(tests/testdata)
 add_subdirectory(integration-tests)
 if(ENABLE_DOC)
 add_subdirectory(doc)
 endif()
 add_subdirectory(contrib)
 add_subdirectory(script)
 add_subdirectory(bpf)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
@ -502,8 +489,10 @@ message(STATUS "summary of build options:
      WARNCFLAGS:     ${WARNCFLAGS}
      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
    Python:
-      Python:          ${Python3_EXECUTABLE}
+      Python:         ${PYTHON_EXECUTABLE}
-      Python3_VERSION: ${Python3_VERSION}
+      PYTHON_VERSION: ${PYTHON_VERSION_STRING}
      Library version:${PYTHONLIBS_VERSION_STRING}
      Cython:         ${CYTHON_EXECUTABLE}
    Test:
      CUnit:          ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
      Failmalloc:     ${ENABLE_FAILMALLOC}
@ -512,15 +501,13 @@ message(STATUS "summary of build options:
      Libxml2:        ${HAVE_LIBXML2} (LIBS='${LIBXML2_LIBRARIES}')
      Libev:          ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
      Libc-ares:      ${HAVE_LIBCARES} (LIBS='${LIBCARES_LIBRARIES}')
      Libngtcp2:      ${HAVE_LIBNGTCP2} (LIBS='${LIBNGTCP2_LIBRARIES}')
      Libngtcp2_crypto_openssl: ${HAVE_LIBNGTCP2_CRYPTO_OPENSSL} (LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES}')
      Libnghttp3:     ${HAVE_LIBNGHTTP3} (LIBS='${LIBNGHTTP3_LIBRARIES}')
      Libbpf:         ${HAVE_LIBBPF} (LIBS='${LIBBPF_LIBRARIES}')
      Libevent(SSL):  ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')
      Spdylay:        ${HAVE_SPDYLAY} (LIBS='${SPDYLAY_LIBRARIES}')
      Jansson:        ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}')
      Jemalloc:       ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
      Zlib:           ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
-      Systemd:        ${HAVE_SYSTEMD} (LIBS='${SYSTEMD_LIBRARIES}')
+      Boost::System:  ${Boost_SYSTEM_LIBRARY}
      Boost::Thread:  ${Boost_THREAD_LIBRARY}
    Third-party:
      http-parser:    ${ENABLE_THIRD_PARTY}
      MRuby:          ${HAVE_MRUBY}
@ -528,9 +515,10 @@ message(STATUS "summary of build options:
    Features:
      Applications:   ${ENABLE_APP}
      HPACK tools:    ${ENABLE_HPACK_TOOLS}
      Libnghttp2_asio:${ENABLE_ASIO_LIB}
      Examples:       ${ENABLE_EXAMPLES}
      Python bindings:${ENABLE_PYTHON_BINDINGS}
      Threading:      ${ENABLE_THREADS}
      HTTP/3(EXPERIMENTAL): ${ENABLE_HTTP3}
 ")
 if(ENABLE_LIB_ONLY_DISABLED_OTHERS)
  message("Only the library will be built. To build other components "
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@ -7,22 +7,21 @@ option(ENABLE_APP       "Build applications (nghttp, nghttpd, nghttpx and h2load
  ${ENABLE_APP_DEFAULT})
 option(ENABLE_HPACK_TOOLS "Build HPACK tools"
  ${ENABLE_HPACK_TOOLS_DEFAULT})
 option(ENABLE_ASIO_LIB  "Build C++ libnghttp2_asio library")
 option(ENABLE_EXAMPLES  "Build examples"
  ${ENABLE_EXAMPLES_DEFAULT})
 option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
  ${ENABLE_PYTHON_BINDINGS_DEFAULT})
 option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
-option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0")
+option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
 option(ENABLE_STATIC_LIB "Build libnghttp2 in static mode also")
 option(ENABLE_SHARED_LIB "Build libnghttp2 as a shared library" ON)
 option(ENABLE_STATIC_CRT "Build libnghttp2 against the MS LIBCMT[d]")
 option(ENABLE_HTTP3      "Enable HTTP/3 support" OFF)
 option(ENABLE_DOC "Build documentation" ON)
 option(WITH_LIBXML2     "Use libxml2"
  ${WITH_LIBXML2_DEFAULT})
 option(WITH_JEMALLOC    "Use jemalloc"
  ${WITH_JEMALLOC_DEFAULT})
 option(WITH_SPDYLAY     "Use spdylay"
  ${WITH_SPDYLAY_DEFAULT})
 option(WITH_MRUBY       "Use mruby")
 option(WITH_NEVERBLEED  "Use neverbleed")
 option(WITH_LIBBPF      "Use libbpf")
 # vim: ft=cmake:
--- a/Dockerfile.android
+++ b/Dockerfile.android
@ -10,62 +10,74 @@
 #
 # $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
 FROM ubuntu:vivid
 # Only use standalone-toolchain for reduce size
 FROM ubuntu:22.04
 MAINTAINER Tatsuhiro Tsujikawa
-ENV NDK_VERSION r25b
+ENV ANDROID_HOME /root/android
-ENV NDK /root/android-ndk-$NDK_VERSION
+ENV PREFIX $ANDROID_HOME/usr/local
-ENV TOOLCHAIN $NDK/toolchains/llvm/prebuilt/linux-x86_64
+ENV TOOLCHAIN $ANDROID_HOME/toolchain
-ENV TARGET aarch64-linux-android
+ENV PATH $TOOLCHAIN/bin:$PATH
 ENV API 33
 ENV AR $TOOLCHAIN/bin/llvm-ar
 ENV CC $TOOLCHAIN/bin/$TARGET$API-clang
 ENV CXX $TOOLCHAIN/bin/$TARGET$API-clang++
 ENV LD $TOOLCHAIN/bin/ld
 ENV RANDLIB $TOOLCHAIN/bin/llvm-ranlib
 ENV STRIP $TOOLCHAIN/bin/llvm-strip
 ENV PREFIX /root/usr/local
-WORKDIR /root
+# It would be better to use nearest ubuntu archive mirror for faster
-RUN apt-get update && \
+# downloads.
-    apt-get install -y unzip make binutils autoconf \
+# RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
      automake autotools-dev libtool pkg-config git \
      curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
      lib32stdc++6 && \
    rm -rf /var/cache/apt/*
-# Download NDK
+RUN apt-get update
-RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux.zip && \
+# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
-   unzip -q android-ndk-$NDK_VERSION-linux.zip && \
+RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
-   rm android-ndk-$NDK_VERSION-linux.zip
+    pkg-config git curl dpkg-dev libxml2-dev \
-
+    genisoimage libc6-i386 lib32stdc++6
 # Setup version of libraries
 ENV OPENSSL_VERSION 1.1.1q
 ENV LIBEV_VERSION 4.33
 ENV ZLIB_VERSION 1.2.13
 ENV CARES_VERSION 1.18.1
 ENV NGHTTP2_VERSION master
 WORKDIR /root/build
-RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
+RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
-    tar xf openssl-$OPENSSL_VERSION.tar.gz && \
+    chmod a+x android-ndk-r10d-linux-x86_64.bin && \
-    rm openssl-$OPENSSL_VERSION.tar.gz
+    ./android-ndk-r10d-linux-x86_64.bin && \
    rm android-ndk-r10d-linux-x86_64.bin
-WORKDIR /root/build/openssl-$OPENSSL_VERSION
+WORKDIR /root/build/android-ndk-r10d
-RUN export ANDROID_NDK_HOME=$NDK PATH=$TOOLCHAIN/bin:$PATH && \
+RUN /bin/bash build/tools/make-standalone-toolchain.sh \
-    ./Configure no-shared --prefix=$PREFIX android-arm64 && \
+    --install-dir=$ANDROID_HOME/toolchain \
    --toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
    --system=linux-x86_64
 WORKDIR /root/build
 RUN git clone https://github.com/tatsuhiro-t/spdylay
 WORKDIR /root/build/spdylay
 RUN autoreconf -i && \
    ./configure \
    --disable-shared \
    --host=arm-linux-androideabi \
    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
    --prefix=$PREFIX \
    --without-libxml2 \
    --disable-src \
    --disable-examples \
    CPPFLAGS="-I$PREFIX/include" \
    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
    LDFLAGS="-L$PREFIX/lib" && \
    make install
 WORKDIR /root/build
 RUN curl -L -O https://www.openssl.org/source/openssl-1.0.2d.tar.gz && \
    tar xf openssl-1.0.2d.tar.gz && \
    rm openssl-1.0.2d.tar.gz
 WORKDIR /root/build/openssl-1.0.2d
 RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
    ./Configure --prefix=$PREFIX android && \
    make && make install_sw
 WORKDIR /root/build
-RUN curl -L -O http://dist.schmorp.de/libev/Attic/libev-$LIBEV_VERSION.tar.gz && \
+RUN curl -L -O http://dist.schmorp.de/libev/libev-4.19.tar.gz && \
-    tar xf libev-$LIBEV_VERSION.tar.gz && \
+    curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
-    rm libev-$LIBEV_VERSION.tar.gz
+    tar xf libev-4.19.tar.gz && \
    rm libev-4.19.tar.gz
-WORKDIR /root/build/libev-$LIBEV_VERSION
+WORKDIR /root/build/libev-4.19
-RUN ./configure \
+RUN patch -p1 < ../libev-4.19-android.patch && \
-    --host=$TARGET \
+    ./configure \
    --host=arm-linux-androideabi \
    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
    --prefix=$PREFIX \
    --disable-shared \
@ -75,12 +87,17 @@ RUN ./configure \
    make install
 WORKDIR /root/build
-RUN curl -L -O https://zlib.net/zlib-$ZLIB_VERSION.tar.gz && \
+RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
-    tar xf zlib-$ZLIB_VERSION.tar.gz && \
+    tar xf zlib-1.2.8.tar.gz && \
-    rm zlib-$ZLIB_VERSION.tar.gz
+    rm zlib-1.2.8.tar.gz
-WORKDIR /root/build/zlib-$ZLIB_VERSION
+WORKDIR /root/build/zlib-1.2.8
-RUN HOST=$TARGET \
+RUN HOST=arm-linux-androideabi \
    CC=$HOST-gcc \
    AR=$HOST-ar \
    LD=$HOST-ld \
    RANLIB=$HOST-ranlib \
    STRIP=$HOST-strip \
    ./configure \
    --prefix=$PREFIX \
    --libdir=$PREFIX/lib \
@ -88,34 +105,24 @@ RUN HOST=$TARGET \
    --static && \
    make install
 WORKDIR /root/build
-RUN curl -L -O https://c-ares.haxx.se/download/c-ares-$CARES_VERSION.tar.gz && \
+RUN git clone https://github.com/nghttp2/nghttp2
    tar xf c-ares-$CARES_VERSION.tar.gz && \
    rm c-ares-$CARES_VERSION.tar.gz
 WORKDIR /root/build/c-ares-$CARES_VERSION
 RUN ./configure \
      --host=$TARGET \
      --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
      --prefix=$PREFIX \
      --disable-shared && \
    make install
 WORKDIR /root/build
 RUN git clone https://github.com/nghttp2/nghttp2 -b $NGHTTP2_VERSION --depth 1
 WORKDIR /root/build/nghttp2
 RUN autoreconf -i && \
    ./configure \
    --enable-app \
    --disable-shared \
-    --host=$TARGET \
+    --host=arm-linux-androideabi \
    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
    --with-xml-prefix="$PREFIX" \
    --without-libxml2 \
    --disable-python-bindings \
    --disable-examples \
    --disable-threads \
    LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
    LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
    CPPFLAGS="-fPIE -I$PREFIX/include" \
    CXXFLAGS="-fno-strict-aliasing" \
    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
    LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
    make && \
-    $STRIP src/nghttpx src/nghttpd src/nghttp
+    arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp
--- a/Makefile.am
+++ b/Makefile.am
@ -20,40 +20,42 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib third-party src bpf examples tests integration-tests \
+SUBDIRS = lib third-party src examples python tests integration-tests \
 	doc contrib script
 # Now with python setuptools, make uninstall will leave many files we
 # cannot easily remove (e.g., easy-install.pth).  Disable it for
 # distcheck rule.
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings
 ACLOCAL_AMFLAGS = -I m4
 dist_doc_DATA = README.rst
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-env \
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
 	Dockerfile.android \
 	cmakeconfig.h.in \
 	CMakeLists.txt \
 	CMakeOptions.txt \
 	cmake/FindSpdylay.cmake \
 	cmake/ExtractValidFlags.cmake \
 	cmake/FindJemalloc.cmake \
 	cmake/FindLibev.cmake \
 	cmake/FindCUnit.cmake \
 	cmake/Version.cmake \
 	cmake/FindCython.cmake \
 	cmake/FindLibevent.cmake \
 	cmake/FindJansson.cmake \
-	cmake/FindLibcares.cmake \
+	cmake/FindLibcares.cmake
 	cmake/FindSystemd.cmake \
 	cmake/FindLibbpf.cmake \
 	cmake/FindLibnghttp3.cmake \
 	cmake/FindLibngtcp2.cmake \
 	cmake/FindLibngtcp2_crypto_openssl.cmake
 .PHONY: clang-format
 # Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for their
+# under third-party directory since we are not responsible for thier
 # coding style.
 clang-format:
 	CLANGFORMAT=`git config --get clangformat.binary`; \
 	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
 	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} examples/*.{c,cc} \
+	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h} bpf/*.c fuzz/*.cc
+	tests/*.{c,h}
--- a/Makefile.os4
+++ b/Makefile.os4
@ -1,36 +0,0 @@
 USE_CLIB2=YES
 ifeq ($(USE_CLIB2), YES)
 LIBC=clib2
 else
 LIBC=newlib
 endif
 all: build
 init:
 	git submodule update --init
 	autoreconf -i
 	automake
 	autoconf
 build: init
 	CC="ppc-amigaos-gcc" CFLAGS="-mcrt=${LIBC} -fPIC" LDFLAGS="-mcrt=${LIBC}" CXXFLAGS="-mcrt=${LIBC} -fPIC" ./configure --host=ppc-amigaos && \
 	make -j$(shell nproc)
 clean:
 	make -f Makefile clean
 	rm -rf autom4te.cache
 	rm compile config.guess config.h config.h.in config.log config.status config.sub configure depcomp install-sh libtool ltmain.sh missing stamp-h1 test-driver INSTALL Makefile Makefile.in *.m4
 release:
 	mkdir -p release/local/common/include/nghttp2
 	mkdir -p release/local/clib2/lib
 	mkdir -p release/local/newlib/lib
 	make -f Makefile.os4 USE_CLIB2=YES
 	cp ./lib/.libs/libnghttp2.a ./lib/.libs/libnghttp2.la release/local/clib2/lib/
 	cp ./lib/includes/nghttp2/* release/local/common/include/nghttp2/
 	make -f Makefile.os4 clean
 	make -f Makefile.os4 USE_CLIB2=NO
 	cp ./lib/.libs/libnghttp2.a ./lib/.libs/libnghttp2.la ./lib/.libs/libnghttp2.so release/local/newlib/lib/
 	lha -aeq libnghttp2.lha release/
--- a/README.rst
+++ b/README.rst
@ -4,21 +4,24 @@ nghttp2 - HTTP/2 C Library
 This is an implementation of the Hypertext Transfer Protocol version 2
 in C.
-The framing layer of HTTP/2 is implemented as a reusable C library.
+The framing layer of HTTP/2 is implemented as a reusable C
-On top of that, we have implemented an HTTP/2 client, server and
+library.  On top of that, we have implemented an HTTP/2 client, server
-proxy.  We have also developed load test and benchmarking tools for
+and proxy.  We have also developed load test and benchmarking tools for
-HTTP/2.
+HTTP/2 and SPDY.
 An HPACK encoder and decoder are available as a public API.
 An experimental high level C++ library is also available.
 We have Python bindings of this library, but we do not have full
 code coverage yet.
 Development Status
 ------------------
-nghttp2 was originally developed based on `RFC 7540
+We have implemented `RFC 7540 <https://tools.ietf.org/html/rfc7540>`_
-<https://tools.ietf.org/html/rfc7540>`_ HTTP/2 and `RFC 7541
+HTTP/2 and `RFC 7541 <https://tools.ietf.org/html/rfc7541>`_ HPACK -
-<https://tools.ietf.org/html/rfc7541>`_ HPACK - Header Compression for
+Header Compression for HTTP/2
 HTTP/2.  Now we are updating our code to implement `RFC 9113
 <https://datatracker.ietf.org/doc/html/rfc9113>`_.
 The nghttp2 code base was forked from the spdylay
 (https://github.com/tatsuhiro-t/spdylay) project.
@ -29,14 +32,12 @@ Public Test Server
 The following endpoints are available to try out our nghttp2
 implementation.
-* https://nghttp2.org/ (TLS + ALPN/NPN and HTTP/3)
+* https://nghttp2.org/ (TLS + ALPN/NPN)
-  This endpoint supports ``h2``, ``h2-16``, ``h2-14``, and
+  This endpoint supports ``h2``, ``h2-16``, ``h2-14``, ``spdy/3.1``
-  ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
+  and ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
  connection.
  It also supports HTTP/3.
 * http://nghttp2.org/ (HTTP Upgrade and HTTP/2 Direct)
  ``h2c`` and ``http/1.1``.
@ -75,15 +76,15 @@ ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
 LibreSSL >= 2.2.0 can be used instead of OpenSSL, but OpenSSL has more
 features than LibreSSL at the time of this writing.
 To enable the SPDY protocol in the application program ``nghttpx`` and
 ``h2load``, the following package is required:
 * spdylay >= 1.3.2
 To enable ``-a`` option (getting linked assets from the downloaded
 resource) in ``nghttp``, the following package is required:
-* libxml2 >= 2.6.26
+* libxml2 >= 2.7.7
 To enable systemd support in nghttpx, the following package is
 required:
 * libsystemd-dev >= 209
 The HPACK tools require the following package:
@ -103,6 +104,29 @@ To mitigate heap fragmentation in long running server programs
     Alpine Linux currently does not support malloc replacement
     due to musl limitations. See details in issue `#762 <https://github.com/nghttp2/nghttp2/issues/762>`_.
 libnghttp2_asio C++ library requires the following packages:
 * libboost-dev >= 1.54.0
 * libboost-thread-dev >= 1.54.0
 The Python bindings require the following packages:
 * cython >= 0.19
 * python >= 2.7
 * python-setuptools
 If you are using Ubuntu 14.04 LTS (trusty) or Debian 7.0 (wheezy) and above run the following to install the needed packages:
 .. code-block:: text
    sudo apt-get install g++ make binutils autoconf automake autotools-dev libtool pkg-config \
      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev \
      libc-ares-dev libjemalloc-dev cython python3-dev python-setuptools
 From Ubuntu 15.10, spdylay has been available as a package named
 `libspdylay-dev`.  For the earlier Ubuntu release, you need to build
 it yourself: http://tatsuhiro-t.github.io/spdylay/
 To enable mruby support for nghttpx, `mruby
 <https://github.com/mruby/mruby>`_ is required.  We need to build
 mruby with C++ ABI explicitly turned on, and probably need other
@ -123,37 +147,22 @@ minimizes the risk of private key leakage when serious bug like
 Heartbleed is exploited.  The neverbleed is disabled by default.  To
 enable it, use ``--with-neverbleed`` configure option.
-To enable the experimental HTTP/3 support for h2load and nghttpx, the
+Building from git
-following libraries are required:
+-----------------
-* `OpenSSL with QUIC support
+Building from git is easy, but please be sure that at least autoconf 2.68 is
-  <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1s+quic>`_; or
+used:
  `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
  31bad2514d21f6207f3925ba56754611c462a873)
 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.10.0
 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 0.7.0
-Use ``--enable-http3`` configure option to enable HTTP/3 feature for
+.. code-block:: text
 h2load and nghttpx.
-In order to build optional eBPF program to direct an incoming QUIC UDP
+    $ git submodule update --init
-datagram to a correct socket for nghttpx, the following libraries are
+    $ autoreconf -i
-required:
+    $ automake
    $ autoconf
    $ ./configure
    $ make
-* libbpf-dev >= 0.7.0
+To compile the source code, gcc >= 4.8.3 or clang >= 3.4 is required.
 Use ``--with-libbpf`` configure option to build eBPF program.
 libelf-dev is needed to build libbpf.
 For Ubuntu 20.04, you can build libbpf from `the source code
 <https://github.com/libbpf/libbpf/releases/tag/v1.0.1>`_.  nghttpx
 requires eBPF program for reloading its configuration and hot swapping
 its executable.
 Compiling libnghttp2 C source code requires a C99 compiler.  gcc 4.8
 is known to be adequate.  In order to compile the C++ source code, gcc
 >= 6.0 or clang >= 6.0 is required.  C++ source code requires C++14
 language features.
 .. note::
@ -178,74 +187,6 @@ language features.
   applications were not built, then using ``--enable-app`` may find
   that cause, such as the missing dependency.
 .. note::
   In order to detect third party libraries, pkg-config is used
   (however we don't use pkg-config for some libraries (e.g., libev)).
   By default, pkg-config searches ``*.pc`` file in the standard
   locations (e.g., /usr/lib/pkgconfig).  If it is necessary to use
   ``*.pc`` file in the custom location, specify paths to
   ``PKG_CONFIG_PATH`` environment variable, and pass it to configure
   script, like so:
   .. code-block:: text
       $ ./configure PKG_CONFIG_PATH=/path/to/pkgconfig
   For pkg-config managed libraries, ``*_CFLAG`` and ``*_LIBS``
   environment variables are defined (e.g., ``OPENSSL_CFLAGS``,
   ``OPENSSL_LIBS``).  Specifying non-empty string to these variables
   completely overrides pkg-config.  In other words, if they are
   specified, pkg-config is not used for detection, and user is
   responsible to specify the correct values to these variables.  For
   complete list of these variables, run ``./configure -h``.
 If you are using Ubuntu 22.04 LTS, run the following to install the
 required packages:
 .. code-block:: text
    sudo apt-get install g++ clang make binutils autoconf automake \
      autotools-dev libtool pkg-config \
      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
      libevent-dev libjansson-dev \
      libc-ares-dev libjemalloc-dev libsystemd-dev \
      ruby-dev bison libelf-dev
 Building nghttp2 from release tar archive
 -----------------------------------------
 The nghttp2 project regularly releases tar archives which includes
 nghttp2 source code, and generated build files.  They can be
 downloaded from `Releases
 <https://github.com/nghttp2/nghttp2/releases>`_ page.
 Building nghttp2 from git requires autotools development packages.
 Building from tar archives does not require them, and thus it is much
 easier.  The usual build step is as follows:
 .. code-block:: text
    $ tar xf nghttp2-X.Y.Z.tar.bz2
    $ cd nghttp2-X.Y.Z
    $ ./configure
    $ make
 Building from git
 -----------------
 Building from git is easy, but please be sure that at least autoconf 2.68 is
 used:
 .. code-block:: text
    $ git submodule update --init
    $ autoreconf -i
    $ automake
    $ autoconf
    $ ./configure
    $ make
 Notes for building on Windows (MSVC)
 ------------------------------------
@ -292,18 +233,6 @@ If you want to compile the applications under ``examples/``, you need
 to remove or rename the ``event.h`` from libev's installation, because
 it conflicts with libevent's installation.
 Notes for installation on Linux systems
 --------------------------------------------
 After installing nghttp2 tool suite with ``make install`` one might experience a similar error:
 .. code-block:: text
    nghttpx: error while loading shared libraries: libnghttp2.so.14: cannot open shared object file: No such file or directory
 This means that the tool is unable to locate the ``libnghttp2.so`` shared library.
 To update the shared library cache run ``sudo ldconfig``.
 Building the documentation
 --------------------------
@ -324,87 +253,6 @@ The generated documents will not be installed with ``make install``.
 The online documentation is available at
 https://nghttp2.org/documentation/
 Build HTTP/3 enabled h2load and nghttpx
 ---------------------------------------
 To build h2load and nghttpx with HTTP/3 feature enabled, run the
 configure script with ``--enable-http3``.
 For nghttpx to reload configurations and swapping its executable while
 gracefully terminating old worker processes, eBPF is required.  Run
 the configure script with ``--enable-http3 --with-libbpf`` to build
 eBPF program.  The QUIC keying material must be set with
 ``--frontend-quic-secret-file`` in order to keep the existing
 connections alive during reload.
 The detailed steps to build HTTP/3 enabled h2load and nghttpx follow.
 Build custom OpenSSL:
 .. code-block:: text
   $ git clone --depth 1 -b OpenSSL_1_1_1s+quic https://github.com/quictls/openssl
   $ cd openssl
   $ ./config --prefix=$PWD/build --openssldir=/etc/ssl
   $ make -j$(nproc)
   $ make install_sw
   $ cd ..
 Build nghttp3:
 .. code-block:: text
   $ git clone --depth 1 -b v0.8.0 https://github.com/ngtcp2/nghttp3
   $ cd nghttp3
   $ autoreconf -i
   $ ./configure --prefix=$PWD/build --enable-lib-only
   $ make -j$(nproc)
   $ make install
   $ cd ..
 Build ngtcp2:
 .. code-block:: text
   $ git clone --depth 1 -b v0.12.0 https://github.com/ngtcp2/ngtcp2
   $ cd ngtcp2
   $ autoreconf -i
   $ ./configure --prefix=$PWD/build --enable-lib-only \
         PKG_CONFIG_PATH="$PWD/../openssl/build/lib/pkgconfig"
   $ make -j$(nproc)
   $ make install
   $ cd ..
 If your Linux distribution does not have libbpf-dev >= 0.7.0, build
 from source:
 .. code-block:: text
   $ git clone --depth 1 -b v1.0.1 https://github.com/libbpf/libbpf
   $ cd libbpf
   $ PREFIX=$PWD/build make -C src install
   $ cd ..
 Build nghttp2:
 .. code-block:: text
   $ git clone https://github.com/nghttp2/nghttp2
   $ cd nghttp2
   $ git submodule update --init
   $ autoreconf -i
   $ ./configure --with-mruby --with-neverbleed --enable-http3 --with-libbpf \
         CC=clang-14 CXX=clang++-14 \
         PKG_CONFIG_PATH="$PWD/../openssl/build/lib/pkgconfig:$PWD/../nghttp3/build/lib/pkgconfig:$PWD/../ngtcp2/build/lib/pkgconfig:$PWD/../libbpf/build/lib64/pkgconfig" \
         LDFLAGS="$LDFLAGS -Wl,-rpath,$PWD/../openssl/build/lib -Wl,-rpath,$PWD/../libbpf/build/lib64"
   $ make -j$(nproc)
 The eBPF program ``reuseport_kern.o`` should be found under bpf
 directory.  Pass ``--quic-bpf-program-file=bpf/reuseport_kern.o``
 option to nghttpx to load it.  See also `HTTP/3 section in nghttpx -
 HTTP/2 proxy - HOW-TO
 <https://nghttp2.org/documentation/nghttpx-howto.html#http-3>`_.
 Unit tests
 ----------
@ -420,8 +268,14 @@ its testing framework.  We depend on the following libraries:
 * golang.org/x/net/http2
 * golang.org/x/net/websocket
 * https://github.com/tatsuhiro-t/go-nghttp2
 * https://github.com/tatsuhiro-t/spdy
-Go modules will download these dependencies automatically.
+To download the above packages, after settings ``GOPATH``, run the
 following command under ``integration-tests`` directory:
 .. code-block:: text
    $ make itprep
 To run the tests, run the following command under
 ``integration-tests`` directory:
@ -432,6 +286,11 @@ To run the tests, run the following command under
 Inside the tests, we use port 3009 to run the test subject server.
 .. note::
   github.com/tatsuhiro-t/spdy is a copy used to be available at
   golang.org/x/net/spdy, but it is now gone.
 Migration from v0.7.15 or earlier
 ---------------------------------
@ -832,7 +691,7 @@ information.  Here is sample output from ``nghttpd``:
 nghttpx - proxy
 +++++++++++++++
-``nghttpx`` is a multi-threaded reverse proxy for HTTP/3, HTTP/2, and
+``nghttpx`` is a multi-threaded reverse proxy for HTTP/2, SPDY and
 HTTP/1.1, and powers http://nghttp2.org and supports HTTP/2 server
 push.
@ -847,30 +706,31 @@ to know how to migrate from earlier releases.
 ``nghttpx`` implements `important performance-oriented features
 <https://istlsfastyet.com/#server-performance>`_ in TLS, such as
 session IDs, session tickets (with automatic key rotation), OCSP
-stapling, dynamic record sizing, ALPN/NPN, forward secrecy and HTTP/2.
+stapling, dynamic record sizing, ALPN/NPN, forward secrecy and SPDY &
-``nghttpx`` also offers the functionality to share session cache and
+HTTP/2.  ``nghttpx`` also offers the functionality to share session
-ticket keys among multiple ``nghttpx`` instances via memcached.
+cache and ticket keys among multiple ``nghttpx`` instances via
 memcached.
 ``nghttpx`` has 2 operation modes:
-================== ======================== ================ =============
+================== ====================== ================ =============
 Mode option        Frontend               Backend          Note
-================== ======================== ================ =============
+================== ====================== ================ =============
-default mode       HTTP/3, HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Reverse proxy
+default mode       HTTP/2, SPDY, HTTP/1.1 HTTP/1.1, HTTP/2 Reverse proxy
-``--http2-proxy``  HTTP/3, HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Forward proxy
+``--http2-proxy``  HTTP/2, SPDY, HTTP/1.1 HTTP/1.1, HTTP/2 Forward proxy
-================== ======================== ================ =============
+================== ====================== ================ =============
 The interesting mode at the moment is the default mode.  It works like
-a reverse proxy and listens for HTTP/3, HTTP/2, and HTTP/1.1 and can
+a reverse proxy and listens for HTTP/2, SPDY and HTTP/1.1 and can be
-be deployed as a SSL/TLS terminator for existing web server.
+deployed as a SSL/TLS terminator for existing web server.
 In all modes, the frontend connections are encrypted by SSL/TLS by
 default.  To disable encryption, use the ``no-tls`` keyword in
-``--frontend`` option.  If encryption is disabled, incoming HTTP/1.1
+``--frontend`` option.  If encryption is disabled, SPDY is disabled in
-connections can be upgraded to HTTP/2 through HTTP Upgrade.  On the
+the frontend and incoming HTTP/1.1 connections can be upgraded to
-other hard, backend connections are not encrypted by default.  To
+HTTP/2 through HTTP Upgrade.  On the other hard, backend connections
-encrypt backend connections, use ``tls`` keyword in ``--backend``
+are not encrypted by default.  To encrypt backend connections, use
-option.
+``tls`` keyword in ``--backend`` option.
 ``nghttpx`` supports a configuration file.  See the ``--conf`` option and
 sample configuration file ``nghttpx.conf.sample``.
@ -880,15 +740,15 @@ server:
 .. code-block:: text
-    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1, HTTP/2) --> Web Server
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1, HTTP/2) --> Web Server
                                          [reverse proxy]
 With the ``--http2-proxy`` option, it works as forward proxy, and it
-is so called secure HTTP/2 proxy:
+is so called secure HTTP/2 proxy (aka SPDY proxy):
 .. code-block:: text
-    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
                                           [secure proxy]          (e.g., Squid, ATS)
 The ``Client`` in the above example needs to be configured to use
@ -921,7 +781,7 @@ proxy through an HTTP proxy:
 .. code-block:: text
-    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
            --===================---> HTTP/2 Proxy
              (HTTP proxy tunnel)     (e.g., nghttpx -s)
@ -929,8 +789,9 @@ proxy through an HTTP proxy:
 Benchmarking tool
 -----------------
-The ``h2load`` program is a benchmarking tool for HTTP/3, HTTP/2, and
+The ``h2load`` program is a benchmarking tool for HTTP/2 and SPDY.
-HTTP/1.1.  The UI of ``h2load`` is heavily inspired by ``weighttp``
+The SPDY support is enabled if the program was built with the spdylay
 library.  The UI of ``h2load`` is heavily inspired by ``weighttp``
 (https://github.com/lighttpd/weighttp).  The typical usage is as
 follows:
@ -973,14 +834,6 @@ threads to avoid saturating a single core on client side.
   considered a DOS attack.  Please only use it against your private
   servers.
 If the experimental HTTP/3 is enabled, h2load can send requests to
 HTTP/3 server.  To do this, specify ``h3`` to ``--npn-list`` option
 like so:
 .. code-block:: text
    $ h2load --npn-list h3 https://127.0.0.1:4433
 HPACK tools
 -----------
@ -1054,7 +907,7 @@ output_length
    The length of the compressed header block.
 percentage_of_original_size
-    ``output_length`` / ``input_length`` * 100
+    ``input_length`` / ``output_length`` * 100
 wire
    The compressed header block as a hex string.
@ -1418,6 +1271,219 @@ associated value includes the state of the dynamic header table after the
 corresponding header set was processed.  The format is the same as
 ``deflatehd``.
 libnghttp2_asio: High level HTTP/2 C++ library
 ----------------------------------------------
 libnghttp2_asio is C++ library built on top of libnghttp2 and provides
 high level abstraction API to build HTTP/2 applications.  It depends
 on the Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
 provides both client and server APIs.
 libnghttp2_asio is not built by default.  Use the ``--enable-asio-lib``
 configure flag to build libnghttp2_asio.  The required Boost libraries
 are:
 * Boost::Asio
 * Boost::System
 * Boost::Thread
 The server API is designed to build an HTTP/2 server very easily to utilize
 C++11 anonymous functions and closures.  The bare minimum example of
 an HTTP/2 server looks like this:
 .. code-block:: cpp
    #include <iostream>
    #include <nghttp2/asio_http2_server.h>
    using namespace nghttp2::asio_http2;
    using namespace nghttp2::asio_http2::server;
    int main(int argc, char *argv[]) {
      boost::system::error_code ec;
      http2 server;
      server.handle("/", [](const request &req, const response &res) {
        res.write_head(200);
        res.end("hello, world\n");
      });
      if (server.listen_and_serve(ec, "localhost", "3000")) {
        std::cerr << "error: " << ec.message() << std::endl;
      }
    }
 Here is sample code to use the client API:
 .. code-block:: cpp
    #include <iostream>
    #include <nghttp2/asio_http2_client.h>
    using boost::asio::ip::tcp;
    using namespace nghttp2::asio_http2;
    using namespace nghttp2::asio_http2::client;
    int main(int argc, char *argv[]) {
      boost::system::error_code ec;
      boost::asio::io_service io_service;
      // connect to localhost:3000
      session sess(io_service, "localhost", "3000");
      sess.on_connect([&sess](tcp::resolver::iterator endpoint_it) {
        boost::system::error_code ec;
        auto req = sess.submit(ec, "GET", "http://localhost:3000/");
        req->on_response([](const response &res) {
          // print status code and response header fields.
          std::cerr << "HTTP/2 " << res.status_code() << std::endl;
          for (auto &kv : res.header()) {
            std::cerr << kv.first << ": " << kv.second.value << "\n";
          }
          std::cerr << std::endl;
          res.on_data([](const uint8_t *data, std::size_t len) {
            std::cerr.write(reinterpret_cast<const char *>(data), len);
            std::cerr << std::endl;
          });
        });
        req->on_close([&sess](uint32_t error_code) {
          // shutdown session after first request was done.
          sess.shutdown();
        });
      });
      sess.on_error([](const boost::system::error_code &ec) {
        std::cerr << "error: " << ec.message() << std::endl;
      });
      io_service.run();
    }
 For more details, see the documentation of libnghttp2_asio.
 Python bindings
 ---------------
 The ``python`` directory contains nghttp2 Python bindings.  The
 bindings currently provide HPACK compressor and decompressor classes
 and an HTTP/2 server.
 The extension module is called ``nghttp2``.
 ``make`` will build the bindings and target Python version is
 determined by the ``configure`` script.  If the detected Python version is not
 what you expect, specify a path to Python executable in a ``PYTHON``
 variable as an argument to configure script (e.g., ``./configure
 PYTHON=/usr/bin/python3.5``).
 The following example code illustrates basic usage of the HPACK compressor
 and decompressor in Python:
 .. code-block:: python
    import binascii
    import nghttp2
    deflater = nghttp2.HDDeflater()
    inflater = nghttp2.HDInflater()
    data = deflater.deflate([(b'foo', b'bar'),
                             (b'baz', b'buz')])
    print(binascii.b2a_hex(data))
    hdrs = inflater.inflate(data)
    print(hdrs)
 The ``nghttp2.HTTP2Server`` class builds on top of the asyncio event
 loop.  On construction, *RequestHandlerClass* must be given, which
 must be a subclass of ``nghttp2.BaseRequestHandler`` class.
 The ``BaseRequestHandler`` class is used to handle the HTTP/2 stream.
 By default, it does nothing.  It must be subclassed to handle each
 event callback method.
 The first callback method invoked is ``on_headers()``.  It is called
 when HEADERS frame, which includes the request header fields, has arrived.
 If the request has a request body, ``on_data(data)`` is invoked for each
 chunk of received data.
 Once the entire request is received, ``on_request_done()`` is invoked.
 When the stream is closed, ``on_close(error_code)`` is called.
 The application can send a response using ``send_response()`` method.
 It can be used in ``on_headers()``, ``on_data()`` or
 ``on_request_done()``.
 The application can push resources using the ``push()`` method.  It must be
 used before the ``send_response()`` call.
 The following instance variables are available:
 client_address
    Contains a tuple of the form (host, port) referring to the
    client's address.
 stream_id
    Stream ID of this stream.
 scheme
    Scheme of the request URI.  This is a value of :scheme header
    field.
 method
    Method of this stream.  This is a value of :method header field.
 host
    This is a value of :authority or host header field.
 path
    This is a value of :path header field.
 The following example illustrates the HTTP2Server and
 BaseRequestHandler usage:
 .. code-block:: python
    #!/usr/bin/env python
    import io, ssl
    import nghttp2
    class Handler(nghttp2.BaseRequestHandler):
        def on_headers(self):
            self.push(path='/css/bootstrap.css',
                      request_headers = [('content-length', '3')],
                      status=200,
                      body='foo')
            self.push(path='/js/bootstrap.js',
                      method='GET',
                      request_headers = [('content-length', '10')],
                      status=200,
                      body='foobarbuzz')
            self.send_response(status=200,
                               headers = [('content-type', 'text/plain')],
                               body=io.BytesIO(b'nghttp2-python FTW'))
    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2
    ctx.load_cert_chain('server.crt', 'server.key')
    # give None to ssl to make the server non-SSL/TLS
    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
    server.serve_forever()
 Contribution
 ------------
--- a/14
+++ b/14
@ -23,15 +23,25 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-. ./android-env
+if [ -z "$ANDROID_HOME" ]; then
    echo 'No $ANDROID_HOME specified.'
    exit 1
 fi
 PREFIX="$ANDROID_HOME"/usr/local
 TOOLCHAIN="$ANDROID_HOME"/toolchain
 PATH="$TOOLCHAIN"/bin:"$PATH"
 ./configure \
    --disable-shared \
-    --host=$TARGET \
+    --host=arm-linux-androideabi \
    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
    --with-xml-prefix="$PREFIX" \
    --without-libxml2 \
    --disable-python-bindings \
    --disable-examples \
    --disable-threads \
    CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
    CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
    CPPFLAGS="-fPIE -I$PREFIX/include" \
    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
    LDFLAGS="-fPIE -pie -L$PREFIX/lib"
--- a/19
+++ b/19
@ -2,7 +2,7 @@
 #
 # nghttp2 - HTTP/2 C Library
 #
-# Copyright (c) 2022 nghttp2 contributors
+# Copyright (c) 2013 Tatsuhiro Tsujikawa
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@ -23,18 +23,11 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-if [ -z "$NDK" ]; then
+if [ -z "$ANDROID_HOME" ]; then
-    echo 'No $NDK specified.'
+    echo 'No $ANDROID_HOME specified.'
    exit 1
 fi
 TOOLCHAIN=$ANDROID_HOME/toolchain
 PATH=$TOOLCHAIN/bin:$PATH
-export TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/linux-x86_64
+make "$@"
 export TARGET=aarch64-linux-android
 export API=33
 export AR=$TOOLCHAIN/bin/llvm-ar
 export CC=$TOOLCHAIN/bin/$TARGET$API-clang
 export CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
 export LD=$TOOLCHAIN/bin/ld
 export RANDLIB=$TOOLCHAIN/bin/llvm-ranlib
 export STRIP=$TOOLCHAIN/bin/llvm-strip
 export PREFIX=$NDK/usr/local
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,53 @@
 # Notes:
 #   - Minimal appveyor.yml file is an empty file. All sections are optional.
 #   - Indent each level of configuration with 2 spaces. Do not use tabs!
 #   - All section names are case-sensitive.
 #   - Section names should be unique on each level.
 #---------------------------------#
 #      general configuration      #
 #---------------------------------#
 # version format
 #version: 0.10.{build}
 # branches to build
 branches:
  # blacklist
  except:
    - gh-pages
 # Do not build on tags (GitHub only)
 skip_tags: true
 #---------------------------------#
 #    environment configuration    #
 #---------------------------------#
 os: Windows Server 2012
 # scripts that run after cloning repository
 install:
  # install Win-Flex-Bison
  #- cmd: cinst winflexbison -y
 #---------------------------------#
 #       build configuration       #
 #---------------------------------#
 # scripts to run before build
 before_build:
  - cmd: cmake .
 # scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
 # before_package:
 # scripts to run after build
 # after_build:
 # to run your custom scripts instead of automatic MSBuild
 build_script:
  - cmd: cmake --build .
 # to disable automatic builds
 # build: off
--- a/author.py
+++ b/author.py
@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # script to extract commit author's name from standard input.  The
 # input should be <AUTHOR>:<EMAIL>, one per line.
@ -49,4 +49,4 @@ for name in names:
        ndict[lowname] = name
 for name in sorted(ndict.values()):
-    print(name)
+    print name
--- a/bpf/CMakeLists.txt
+++ b/bpf/CMakeLists.txt
@ -1,13 +0,0 @@
 if(LIBBPF_FOUND)
  add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    COMMAND ${CMAKE_C_COMPILER} ${BPFCFLAGS} ${EXTRABPFCFLAGS} -I${LIBBPF_INCLUDE_DIRS} -target bpf -c reuseport_kern.c -o "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
    VERBATIM)
  add_custom_target(bpf ALL
    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    VERBATIM)
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}")
 endif()
--- a/bpf/reuseport_kern.c
+++ b/bpf/reuseport_kern.c
@ -1,663 +0,0 @@
 /*
 * nghttp2 - HTTP/2 C Library
 *
 * Copyright (c) 2021 Tatsuhiro Tsujikawa
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <linux/udp.h>
 #include <linux/bpf.h>
 #include <bpf/bpf_helpers.h>
 /*
 * How to compile:
 *
 * clang-12 -O2 -Wall -target bpf -g -c reuseport_kern.c -o reuseport_kern.o \
 *   -I/path/to/kernel/include
 *
 * See
 * https://www.kernel.org/doc/Documentation/kbuild/headers_install.txt
 * how to install kernel header files.
 */
 /* AES_CBC_decrypt_buffer: https://github.com/kokke/tiny-AES-c
   License is Public Domain.  Commit hash:
   12e7744b4919e9d55de75b7ab566326a1c8e7a67 */
 #define AES_BLOCKLEN                                                           \
  16 /* Block length in bytes - AES is 128b block                              \
        only */
 #define AES_KEYLEN 16 /* Key length in bytes */
 #define AES_keyExpSize 176
 struct AES_ctx {
  __u8 RoundKey[AES_keyExpSize];
 };
 /* The number of columns comprising a state in AES. This is a constant
   in AES. Value=4 */
 #define Nb 4
 #define Nk 4  /* The number of 32 bit words in a key. */
 #define Nr 10 /* The number of rounds in AES Cipher. */
 /* state - array holding the intermediate results during
   decryption. */
 typedef __u8 state_t[4][4];
 /* The lookup-tables are marked const so they can be placed in
   read-only storage instead of RAM The numbers below can be computed
   dynamically trading ROM for RAM - This can be useful in (embedded)
   bootloader applications, where ROM is often limited. */
 static const __u8 sbox[256] = {
    /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
    0xb0, 0x54, 0xbb, 0x16};
 static const __u8 rsbox[256] = {
    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
    0x55, 0x21, 0x0c, 0x7d};
 /* The round constant word array, Rcon[i], contains the values given
   by x to the power (i-1) being powers of x (x is denoted as {02}) in
   the field GF(2^8) */
 static const __u8 Rcon[11] = {0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
                              0x20, 0x40, 0x80, 0x1b, 0x36};
 #define getSBoxValue(num) (sbox[(num)])
 /* This function produces Nb(Nr+1) round keys. The round keys are used
   in each round to decrypt the states. */
 static void KeyExpansion(__u8 *RoundKey, const __u8 *Key) {
  unsigned i, j, k;
  __u8 tempa[4]; /* Used for the column/row operations */
  /* The first round key is the key itself. */
  for (i = 0; i < Nk; ++i) {
    RoundKey[(i * 4) + 0] = Key[(i * 4) + 0];
    RoundKey[(i * 4) + 1] = Key[(i * 4) + 1];
    RoundKey[(i * 4) + 2] = Key[(i * 4) + 2];
    RoundKey[(i * 4) + 3] = Key[(i * 4) + 3];
  }
  /* All other round keys are found from the previous round keys. */
  for (i = Nk; i < Nb * (Nr + 1); ++i) {
    {
      k = (i - 1) * 4;
      tempa[0] = RoundKey[k + 0];
      tempa[1] = RoundKey[k + 1];
      tempa[2] = RoundKey[k + 2];
      tempa[3] = RoundKey[k + 3];
    }
    if (i % Nk == 0) {
      /* This function shifts the 4 bytes in a word to the left once.
         [a0,a1,a2,a3] becomes [a1,a2,a3,a0] */
      /* Function RotWord() */
      {
        const __u8 u8tmp = tempa[0];
        tempa[0] = tempa[1];
        tempa[1] = tempa[2];
        tempa[2] = tempa[3];
        tempa[3] = u8tmp;
      }
      /* SubWord() is a function that takes a four-byte input word and
         applies the S-box to each of the four bytes to produce an
         output word. */
      /* Function Subword() */
      {
        tempa[0] = getSBoxValue(tempa[0]);
        tempa[1] = getSBoxValue(tempa[1]);
        tempa[2] = getSBoxValue(tempa[2]);
        tempa[3] = getSBoxValue(tempa[3]);
      }
      tempa[0] = tempa[0] ^ Rcon[i / Nk];
    }
    j = i * 4;
    k = (i - Nk) * 4;
    RoundKey[j + 0] = RoundKey[k + 0] ^ tempa[0];
    RoundKey[j + 1] = RoundKey[k + 1] ^ tempa[1];
    RoundKey[j + 2] = RoundKey[k + 2] ^ tempa[2];
    RoundKey[j + 3] = RoundKey[k + 3] ^ tempa[3];
  }
 }
 static void AES_init_ctx(struct AES_ctx *ctx, const __u8 *key) {
  KeyExpansion(ctx->RoundKey, key);
 }
 /* This function adds the round key to state.  The round key is added
   to the state by an XOR function. */
 static void AddRoundKey(__u8 round, state_t *state, const __u8 *RoundKey) {
  __u8 i, j;
  for (i = 0; i < 4; ++i) {
    for (j = 0; j < 4; ++j) {
      (*state)[i][j] ^= RoundKey[(round * Nb * 4) + (i * Nb) + j];
    }
  }
 }
 static __u8 xtime(__u8 x) { return ((x << 1) ^ (((x >> 7) & 1) * 0x1b)); }
 #define Multiply(x, y)                                                         \
  (((y & 1) * x) ^ ((y >> 1 & 1) * xtime(x)) ^                                 \
   ((y >> 2 & 1) * xtime(xtime(x))) ^                                          \
   ((y >> 3 & 1) * xtime(xtime(xtime(x)))) ^                                   \
   ((y >> 4 & 1) * xtime(xtime(xtime(xtime(x))))))
 #define getSBoxInvert(num) (rsbox[(num)])
 /* MixColumns function mixes the columns of the state matrix.  The
   method used to multiply may be difficult to understand for the
   inexperienced. Please use the references to gain more
   information. */
 static void InvMixColumns(state_t *state) {
  int i;
  __u8 a, b, c, d;
  for (i = 0; i < 4; ++i) {
    a = (*state)[i][0];
    b = (*state)[i][1];
    c = (*state)[i][2];
    d = (*state)[i][3];
    (*state)[i][0] = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^
                     Multiply(d, 0x09);
    (*state)[i][1] = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^
                     Multiply(d, 0x0d);
    (*state)[i][2] = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^
                     Multiply(d, 0x0b);
    (*state)[i][3] = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^
                     Multiply(d, 0x0e);
  }
 }
 extern __u32 LINUX_KERNEL_VERSION __kconfig;
 /* The SubBytes Function Substitutes the values in the state matrix
   with values in an S-box. */
 static void InvSubBytes(state_t *state) {
  __u8 i, j;
  if (LINUX_KERNEL_VERSION < KERNEL_VERSION(5, 10, 0)) {
    for (i = 0; i < 4; ++i) {
      for (j = 0; j < 4; ++j) {
        /* Ubuntu 20.04 LTS kernel 5.4.0 needs this workaround
           otherwise "math between map_value pointer and register with
           unbounded min value is not allowed".  5.10.0 is a kernel
           version that works but it might not be the minimum
           version.  */
        __u8 k = (*state)[j][i];
        (*state)[j][i] = k ? getSBoxInvert(k) : getSBoxInvert(0);
      }
    }
  } else {
    for (i = 0; i < 4; ++i) {
      for (j = 0; j < 4; ++j) {
        (*state)[j][i] = getSBoxInvert((*state)[j][i]);
      }
    }
  }
 }
 static void InvShiftRows(state_t *state) {
  __u8 temp;
  /* Rotate first row 1 columns to right */
  temp = (*state)[3][1];
  (*state)[3][1] = (*state)[2][1];
  (*state)[2][1] = (*state)[1][1];
  (*state)[1][1] = (*state)[0][1];
  (*state)[0][1] = temp;
  /* Rotate second row 2 columns to right */
  temp = (*state)[0][2];
  (*state)[0][2] = (*state)[2][2];
  (*state)[2][2] = temp;
  temp = (*state)[1][2];
  (*state)[1][2] = (*state)[3][2];
  (*state)[3][2] = temp;
  /* Rotate third row 3 columns to right */
  temp = (*state)[0][3];
  (*state)[0][3] = (*state)[1][3];
  (*state)[1][3] = (*state)[2][3];
  (*state)[2][3] = (*state)[3][3];
  (*state)[3][3] = temp;
 }
 static void InvCipher(state_t *state, const __u8 *RoundKey) {
  /* Add the First round key to the state before starting the
     rounds. */
  AddRoundKey(Nr, state, RoundKey);
  /* There will be Nr rounds.  The first Nr-1 rounds are identical.
     These Nr rounds are executed in the loop below.  Last one without
     InvMixColumn() */
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 1, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 2, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 3, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 4, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 5, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 6, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 7, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 8, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 9, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 10, state, RoundKey);
 }
 static void AES_ECB_decrypt(const struct AES_ctx *ctx, __u8 *buf) {
  /* The next function call decrypts the PlainText with the Key using
     AES algorithm. */
  InvCipher((state_t *)buf, ctx->RoundKey);
 }
 /* rol32: From linux kernel source code */
 /**
 * rol32 - rotate a 32-bit value left
 * @word: value to rotate
 * @shift: bits to roll
 */
 static inline __u32 rol32(__u32 word, unsigned int shift) {
  return (word << shift) | (word >> ((-shift) & 31));
 }
 /* jhash.h: Jenkins hash support.
 *
 * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
 *
 * https://burtleburtle.net/bob/hash/
 *
 * These are the credits from Bob's sources:
 *
 * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
 *
 * These are functions for producing 32-bit hashes for hash table lookup.
 * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
 * are externally useful functions.  Routines to test the hash are included
 * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 * the public domain.  It has no warranty.
 *
 * Copyright (C) 2009-2010 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
 *
 * I've modified Bob's hash to be useful in the Linux kernel, and
 * any bugs present are my fault.
 * Jozsef
 */
 /* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
 #define __jhash_final(a, b, c)                                                 \
  {                                                                            \
    c ^= b;                                                                    \
    c -= rol32(b, 14);                                                         \
    a ^= c;                                                                    \
    a -= rol32(c, 11);                                                         \
    b ^= a;                                                                    \
    b -= rol32(a, 25);                                                         \
    c ^= b;                                                                    \
    c -= rol32(b, 16);                                                         \
    a ^= c;                                                                    \
    a -= rol32(c, 4);                                                          \
    b ^= a;                                                                    \
    b -= rol32(a, 14);                                                         \
    c ^= b;                                                                    \
    c -= rol32(b, 24);                                                         \
  }
 /* __jhash_nwords - hash exactly 3, 2 or 1 word(s) */
 static inline __u32 __jhash_nwords(__u32 a, __u32 b, __u32 c, __u32 initval) {
  a += initval;
  b += initval;
  c += initval;
  __jhash_final(a, b, c);
  return c;
 }
 /* An arbitrary initial parameter */
 #define JHASH_INITVAL 0xdeadbeef
 static inline __u32 jhash_2words(__u32 a, __u32 b, __u32 initval) {
  return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2));
 }
 struct {
  __uint(type, BPF_MAP_TYPE_HASH);
  __uint(max_entries, 255);
  __type(key, __u64);
  __type(value, __u32);
 } cid_prefix_map SEC(".maps");
 struct {
  __uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);
  __uint(max_entries, 255);
  __type(key, __u32);
  __type(value, __u32);
 } reuseport_array SEC(".maps");
 struct {
  __uint(type, BPF_MAP_TYPE_ARRAY);
  __uint(max_entries, 3);
  __type(key, __u32);
  __type(value, __u64);
 } sk_info SEC(".maps");
 typedef struct quic_hd {
  __u8 *dcid;
  __u32 dcidlen;
  __u32 dcid_offset;
  __u8 type;
 } quic_hd;
 #define SV_DCIDLEN 20
 #define MAX_DCIDLEN 20
 #define MIN_DCIDLEN 8
 #define CID_PREFIXLEN 8
 #define CID_PREFIX_OFFSET 1
 enum {
  NGTCP2_PKT_INITIAL = 0x0,
  NGTCP2_PKT_0RTT = 0x1,
  NGTCP2_PKT_HANDSHAKE = 0x2,
  NGTCP2_PKT_SHORT = 0x40,
 };
 static inline int parse_quic(quic_hd *qhd, __u8 *data, __u8 *data_end) {
  __u8 *p;
  __u64 dcidlen;
  if (*data & 0x80) {
    p = data + 1 + 4;
    /* Do not check the actual DCID length because we might not buffer
       entire DCID here. */
    dcidlen = *p;
    if (dcidlen > MAX_DCIDLEN || dcidlen < MIN_DCIDLEN) {
      return -1;
    }
    ++p;
    qhd->type = (*data & 0x30) >> 4;
    qhd->dcid = p;
    qhd->dcidlen = dcidlen;
    qhd->dcid_offset = 6;
  } else {
    qhd->type = NGTCP2_PKT_SHORT;
    qhd->dcid = data + 1;
    qhd->dcidlen = SV_DCIDLEN;
    qhd->dcid_offset = 1;
  }
  return 0;
 }
 static __u32 hash(const __u8 *data, __u32 datalen, __u32 initval) {
  __u32 a, b;
  a = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
  b = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7];
  return jhash_2words(a, b, initval);
 }
 static __u32 sk_index_from_dcid(const quic_hd *qhd,
                                const struct sk_reuseport_md *reuse_md,
                                __u64 num_socks) {
  __u32 len = qhd->dcidlen;
  __u32 h = reuse_md->hash;
  __u8 hbuf[8];
  if (len > 16) {
    __builtin_memset(hbuf, 0, sizeof(hbuf));
    switch (len) {
    case 20:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 4);
      break;
    case 19:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 3);
      break;
    case 18:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 2);
      break;
    case 17:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 1);
      break;
    }
    h = hash(hbuf, sizeof(hbuf), h);
    len = 16;
  }
  if (len > 8) {
    __builtin_memset(hbuf, 0, sizeof(hbuf));
    switch (len) {
    case 16:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 8);
      break;
    case 15:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 7);
      break;
    case 14:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 6);
      break;
    case 13:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 5);
      break;
    case 12:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 4);
      break;
    case 11:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 3);
      break;
    case 10:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 2);
      break;
    case 9:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 1);
      break;
    }
    h = hash(hbuf, sizeof(hbuf), h);
    len = 8;
  }
  return hash(qhd->dcid, len, h) % num_socks;
 }
 SEC("sk_reuseport")
 int select_reuseport(struct sk_reuseport_md *reuse_md) {
  __u32 sk_index, *psk_index;
  __u64 *pnum_socks, *pkey;
  __u32 zero = 0, key_high_idx = 1, key_low_idx = 2;
  int rv;
  quic_hd qhd;
  __u8 qpktbuf[6 + MAX_DCIDLEN];
  struct AES_ctx aes_ctx;
  __u8 key[AES_KEYLEN];
  __u8 *cid_prefix;
  if (bpf_skb_load_bytes(reuse_md, sizeof(struct udphdr), qpktbuf,
                         sizeof(qpktbuf)) != 0) {
    return SK_DROP;
  }
  pnum_socks = bpf_map_lookup_elem(&sk_info, &zero);
  if (pnum_socks == NULL) {
    return SK_DROP;
  }
  pkey = bpf_map_lookup_elem(&sk_info, &key_high_idx);
  if (pkey == NULL) {
    return SK_DROP;
  }
  __builtin_memcpy(key, pkey, sizeof(*pkey));
  pkey = bpf_map_lookup_elem(&sk_info, &key_low_idx);
  if (pkey == NULL) {
    return SK_DROP;
  }
  __builtin_memcpy(key + sizeof(*pkey), pkey, sizeof(*pkey));
  rv = parse_quic(&qhd, qpktbuf, qpktbuf + sizeof(qpktbuf));
  if (rv != 0) {
    return SK_DROP;
  }
  AES_init_ctx(&aes_ctx, key);
  switch (qhd.type) {
  case NGTCP2_PKT_INITIAL:
  case NGTCP2_PKT_0RTT:
    if (qhd.dcidlen == SV_DCIDLEN) {
      cid_prefix = qhd.dcid + CID_PREFIX_OFFSET;
      AES_ECB_decrypt(&aes_ctx, cid_prefix);
      psk_index = bpf_map_lookup_elem(&cid_prefix_map, cid_prefix);
      if (psk_index != NULL) {
        sk_index = *psk_index;
        break;
      }
    }
    sk_index = sk_index_from_dcid(&qhd, reuse_md, *pnum_socks);
    break;
  case NGTCP2_PKT_HANDSHAKE:
  case NGTCP2_PKT_SHORT:
    if (qhd.dcidlen != SV_DCIDLEN) {
      return SK_DROP;
    }
    cid_prefix = qhd.dcid + CID_PREFIX_OFFSET;
    AES_ECB_decrypt(&aes_ctx, cid_prefix);
    psk_index = bpf_map_lookup_elem(&cid_prefix_map, cid_prefix);
    if (psk_index == NULL) {
      sk_index = sk_index_from_dcid(&qhd, reuse_md, *pnum_socks);
      break;
    }
    sk_index = *psk_index;
    break;
  default:
    return SK_DROP;
  }
  rv = bpf_sk_select_reuseport(reuse_md, &reuseport_array, &sk_index, 0);
  if (rv != 0) {
    return SK_DROP;
  }
  return SK_PASS;
 }
--- a/cmake/FindCython.cmake
+++ b/cmake/FindCython.cmake
@ -0,0 +1,44 @@
 # Find the Cython compiler.
 #
 # This code sets the following variables:
 #
 #  CYTHON_EXECUTABLE
 #
 # See also UseCython.cmake
 #=============================================================================
 # Copyright 2011 Kitware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #=============================================================================
 # Use the Cython executable that lives next to the Python executable
 # if it is a local installation.
 find_package( PythonInterp )
 if( PYTHONINTERP_FOUND )
  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
  find_program( CYTHON_EXECUTABLE
    NAMES cython cython.bat cython3
    HINTS ${_python_path}
    )
 else()
  find_program( CYTHON_EXECUTABLE
    NAMES cython cython.bat cython3
    )
 endif()
 include( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
 mark_as_advanced( CYTHON_EXECUTABLE )
--- a/cmake/FindLibbpf.cmake
+++ b/cmake/FindLibbpf.cmake
@ -1,32 +0,0 @@
 # - Try to find libbpf
 # Once done this will define
 #  LIBBPF_FOUND        - System has libbpf
 #  LIBBPF_INCLUDE_DIRS - The libbpf include directories
 #  LIBBPF_LIBRARIES    - The libraries needed to use libbpf
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBBPF QUIET libbpf)
 find_path(LIBBPF_INCLUDE_DIR
  NAMES bpf/bpf.h
  HINTS ${PC_LIBBPF_INCLUDE_DIRS}
 )
 find_library(LIBBPF_LIBRARY
  NAMES bpf
  HINTS ${PC_LIBBPF_LIBRARY_DIRS}
 )
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBBPF_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libbpf REQUIRED_VARS
                                  LIBBPF_LIBRARY LIBBPF_INCLUDE_DIR
                                  VERSION_VAR LIBBPF_VERSION)
 if(LIBBPF_FOUND)
  set(LIBBPF_LIBRARIES     ${LIBBPF_LIBRARY})
  set(LIBBPF_INCLUDE_DIRS  ${LIBBPF_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBBPF_INCLUDE_DIR LIBBPF_LIBRARY)
--- a/cmake/FindLibevent.cmake
+++ b/cmake/FindLibevent.cmake
@ -40,9 +40,6 @@ if(LIBEVENT_INCLUDE_DIR)
    # Libevent 2.0
    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h"
      LIBEVENT_VERSION REGEX "${_version_regex}")
    if("${LIBEVENT_VERSION}" STREQUAL "")
      set(LIBEVENT_VERSION ${PC_LIBEVENT_VERSION})
    endif()
  else()
    # Libevent 1.4
    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event-config.h"
--- a/cmake/FindLibnghttp3.cmake
+++ b/cmake/FindLibnghttp3.cmake
@ -1,41 +0,0 @@
 # - Try to find libnghttp3
 # Once done this will define
 #  LIBNGHTTP3_FOUND        - System has libnghttp3
 #  LIBNGHTTP3_INCLUDE_DIRS - The libnghttp3 include directories
 #  LIBNGHTTP3_LIBRARIES    - The libraries needed to use libnghttp3
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGHTTP3 QUIET libnghttp3)
 find_path(LIBNGHTTP3_INCLUDE_DIR
  NAMES nghttp3/nghttp3.h
  HINTS ${PC_LIBNGHTTP3_INCLUDE_DIRS}
 )
 find_library(LIBNGHTTP3_LIBRARY
  NAMES nghttp3
  HINTS ${PC_LIBNGHTTP3_LIBRARY_DIRS}
 )
 if(LIBNGHTTP3_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGHTTP3_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGHTTP3_INCLUDE_DIR}/nghttp3/version.h"
    LIBNGHTTP3_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGHTTP3_VERSION "${LIBNGHTTP3_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBNGHTTP3_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libnghttp3 REQUIRED_VARS
                                  LIBNGHTTP3_LIBRARY LIBNGHTTP3_INCLUDE_DIR
                                  VERSION_VAR LIBNGHTTP3_VERSION)
 if(LIBNGHTTP3_FOUND)
  set(LIBNGHTTP3_LIBRARIES     ${LIBNGHTTP3_LIBRARY})
  set(LIBNGHTTP3_INCLUDE_DIRS  ${LIBNGHTTP3_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGHTTP3_INCLUDE_DIR LIBNGHTTP3_LIBRARY)
--- a/cmake/FindLibngtcp2.cmake
+++ b/cmake/FindLibngtcp2.cmake
@ -1,41 +0,0 @@
 # - Try to find libngtcp2
 # Once done this will define
 #  LIBNGTCP2_FOUND        - System has libngtcp2
 #  LIBNGTCP2_INCLUDE_DIRS - The libngtcp2 include directories
 #  LIBNGTCP2_LIBRARIES    - The libraries needed to use libngtcp2
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGTCP2 QUIET libngtcp2)
 find_path(LIBNGTCP2_INCLUDE_DIR
  NAMES ngtcp2/ngtcp2.h
  HINTS ${PC_LIBNGTCP2_INCLUDE_DIRS}
 )
 find_library(LIBNGTCP2_LIBRARY
  NAMES ngtcp2
  HINTS ${PC_LIBNGTCP2_LIBRARY_DIRS}
 )
 if(LIBNGTCP2_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGTCP2_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGTCP2_INCLUDE_DIR}/ngtcp2/version.h"
    LIBNGTCP2_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGTCP2_VERSION "${LIBNGTCP2_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBNGTCP2_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libngtcp2 REQUIRED_VARS
                                  LIBNGTCP2_LIBRARY LIBNGTCP2_INCLUDE_DIR
                                  VERSION_VAR LIBNGTCP2_VERSION)
 if(LIBNGTCP2_FOUND)
  set(LIBNGTCP2_LIBRARIES     ${LIBNGTCP2_LIBRARY})
  set(LIBNGTCP2_INCLUDE_DIRS  ${LIBNGTCP2_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGTCP2_INCLUDE_DIR LIBNGTCP2_LIBRARY)
--- a/cmake/FindLibngtcp2_crypto_openssl.cmake
+++ b/cmake/FindLibngtcp2_crypto_openssl.cmake
@ -1,43 +0,0 @@
 # - Try to find libngtcp2_crypto_openssl
 # Once done this will define
 #  LIBNGTCP2_CRYPTO_OPENSSL_FOUND        - System has libngtcp2_crypto_openssl
 #  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS - The libngtcp2_crypto_openssl include directories
 #  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES    - The libraries needed to use libngtcp2_crypto_openssl
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGTCP2_CRYPTO_OPENSSL QUIET libngtcp2_crypto_openssl)
 find_path(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
  NAMES ngtcp2/ngtcp2_crypto_openssl.h
  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS}
 )
 find_library(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
  NAMES ngtcp2_crypto_openssl
  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY_DIRS}
 )
 if(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGTCP2_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR}/ngtcp2/version.h"
    LIBNGTCP2_CRYPTO_OPENSSL_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGTCP2_CRYPTO_OPENSSL_VERSION "${LIBNGTCP2_CRYPTO_OPENSSL_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set
 # LIBNGTCP2_CRYPTO_OPENSSL_FOUND to TRUE if all listed variables are
 # TRUE and the requested version matches.
 find_package_handle_standard_args(Libngtcp2_crypto_openssl REQUIRED_VARS
                                  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
                                  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
                                  VERSION_VAR LIBNGTCP2_CRYPTO_OPENSSL_VERSION)
 if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
  set(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES ${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY})
  set(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS ${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
                 LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY)
--- a/cmake/FindSpdylay.cmake
+++ b/cmake/FindSpdylay.cmake
@ -0,0 +1,40 @@
 # - Try to find spdylay
 # Once done this will define
 #  SPDYLAY_FOUND        - System has spdylay
 #  SPDYLAY_INCLUDE_DIRS - The spdylay include directories
 #  SPDYLAY_LIBRARIES    - The libraries needed to use spdylay
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SPDYLAY QUIET libspdylay)
 find_path(SPDYLAY_INCLUDE_DIR
  NAMES spdylay/spdylay.h
  HINTS ${PC_SPDYLAY_INCLUDE_DIRS}
 )
 find_library(SPDYLAY_LIBRARY
  NAMES spdylay
  HINTS ${PC_SPDYLAY_LIBRARY_DIRS}
 )
 if(SPDYLAY_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+SPDYLAY_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${SPDYLAY_INCLUDE_DIR}/spdylay/spdylayver.h"
    SPDYLAY_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    SPDYLAY_VERSION "${SPDYLAY_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Spdylay REQUIRED_VARS
                                  SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR
                                  VERSION_VAR SPDYLAY_VERSION)
 if(SPDYLAY_FOUND)
  set(SPDYLAY_LIBRARIES     ${SPDYLAY_LIBRARY})
  set(SPDYLAY_INCLUDE_DIRS  ${SPDYLAY_INCLUDE_DIR})
 endif()
 mark_as_advanced(SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY)
--- a/cmake/FindSystemd.cmake
+++ b/cmake/FindSystemd.cmake
@ -1,19 +0,0 @@
 # - Try to find systemd
 # Once done this will define
 #  SYSTEMD_FOUND        - System has systemd
 #  SYSTEMD_INCLUDE_DIRS - The systemd include directories
 #  SYSTEMD_LIBRARIES    - The libraries needed to use systemd
 include(FeatureSummary)
 set_package_properties(Systemd PROPERTIES
        URL "http://freedesktop.org/wiki/Software/systemd/"
        DESCRIPTION "System and Service Manager")
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
 find_library(SYSTEMD_LIBRARIES NAMES systemd ${PC_SYSTEMD_LIBRARY_DIRS})
 find_path(SYSTEMD_INCLUDE_DIRS systemd/sd-login.h HINTS ${PC_SYSTEMD_INCLUDE_DIRS})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Systemd DEFAULT_MSG SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES)
 mark_as_advanced(SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@ -1,3 +1,7 @@
 /* Hint to the compiler that a function parameter is not used  */
 #define _U_ @HINT_UNUSED_PARAM@
 /* Hint to the compiler that a function never returns */
 #define NGHTTP2_NORETURN @HINT_NORETURN@
@ -13,6 +17,9 @@
 /* Define to 1 if you have `libxml2` library. */
 #cmakedefine HAVE_LIBXML2 1
 /* Define to 1 if you have `spdylay` library. */
 #cmakedefine HAVE_SPDYLAY 1
 /* Define to 1 if you have `mruby` library. */
 #cmakedefine HAVE_MRUBY 1
@ -31,9 +38,6 @@
 /* Define to 1 if you have the `accept4` function. */
 #cmakedefine HAVE_ACCEPT4 1
 /* Define to 1 if you have the `mkostemp` function. */
 #cmakedefine HAVE_MKOSTEMP 1
 /* Define to 1 if you have the `initgroups` function. */
 #cmakedefine01 HAVE_DECL_INITGROUPS
@ -78,15 +82,3 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 /* Define to 1 if HTTP/3 is enabled. */
 #cmakedefine ENABLE_HTTP3 1
 /* Define to 1 if you have `libbpf` library. */
 #cmakedefine HAVE_LIBBPF 1
 /* Define to 1 if you have enum bpf_stats_type in linux/bpf.h. */
 #cmakedefine HAVE_BPF_STATS_TYPE 1
 /* Define to 1 if you have `libngtcp2_crypto_openssl` library. */
 #cmakedefine HAVE_LIBNGTCP2_CRYPTO_OPENSSL
--- a/configure.ac
+++ b/configure.ac
@ -22,10 +22,10 @@ dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 dnl Do not change user variables!
-dnl https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
+dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [1.52.0-DEV], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [1.20.0-DEV], [t-tujikawa@users.sourceforge.net])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@ -43,10 +43,10 @@ AM_INIT_AUTOMAKE([subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl See versioning rule:
-dnl  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 38)
+AC_SUBST(LT_CURRENT, 26)
-AC_SUBST(LT_REVISION, 1)
+AC_SUBST(LT_REVISION, 4)
-AC_SUBST(LT_AGE, 24)
+AC_SUBST(LT_AGE, 12)
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
 minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
@ -82,11 +82,21 @@ AC_ARG_ENABLE([hpack-tools],
                    [Build HPACK tools [default=check]])],
    [request_hpack_tools=$enableval], [request_hpack_tools=check])
 AC_ARG_ENABLE([asio-lib],
    [AS_HELP_STRING([--enable-asio-lib],
                    [Build C++ libnghttp2_asio library [default=no]])],
    [request_asio_lib=$enableval], [request_asio_lib=no])
 AC_ARG_ENABLE([examples],
    [AS_HELP_STRING([--enable-examples],
                    [Build examples [default=check]])],
    [request_examples=$enableval], [request_examples=check])
 AC_ARG_ENABLE([python-bindings],
    [AS_HELP_STRING([--enable-python-bindings],
                    [Build Python bindings [default=check]])],
    [request_python_bindings=$enableval], [request_python_bindings=check])
 AC_ARG_ENABLE([failmalloc],
    [AS_HELP_STRING([--disable-failmalloc],
                    [Do not build failmalloc test program])],
@ -94,63 +104,23 @@ AC_ARG_ENABLE([failmalloc],
 AC_ARG_ENABLE([lib-only],
    [AS_HELP_STRING([--enable-lib-only],
-                    [Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools])],
+                    [Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools --disable-python-bindings])],
    [request_lib_only=$enableval], [request_lib_only=no])
 AC_ARG_ENABLE([http3],
    [AS_HELP_STRING([--enable-http3],
                    [(EXPERIMENTAL) Enable HTTP/3.  This requires ngtcp2, nghttp3, and a custom OpenSSL.])],
    [request_http3=$enableval], [request_http3=no])
 AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--with-libxml2],
                    [Use libxml2 [default=check]])],
    [request_libxml2=$withval], [request_libxml2=check])
 AC_ARG_WITH([jansson],
    [AS_HELP_STRING([--with-jansson],
                    [Use jansson [default=check]])],
    [request_jansson=$withval], [request_jansson=check])
 AC_ARG_WITH([zlib],
    [AS_HELP_STRING([--with-zlib],
                    [Use zlib [default=check]])],
    [request_zlib=$withval], [request_zlib=check])
 AC_ARG_WITH([libevent-openssl],
    [AS_HELP_STRING([--with-libevent-openssl],
                    [Use libevent_openssl [default=check]])],
    [request_libevent_openssl=$withval], [request_libevent_openssl=check])
 AC_ARG_WITH([libcares],
    [AS_HELP_STRING([--with-libcares],
                    [Use libc-ares [default=check]])],
    [request_libcares=$withval], [request_libcares=check])
 AC_ARG_WITH([openssl],
    [AS_HELP_STRING([--with-openssl],
                    [Use openssl [default=check]])],
    [request_openssl=$withval], [request_openssl=check])
 AC_ARG_WITH([libev],
    [AS_HELP_STRING([--with-libev],
                    [Use libev [default=check]])],
    [request_libev=$withval], [request_libev=check])
 AC_ARG_WITH([cunit],
    [AS_HELP_STRING([--with-cunit],
                    [Use cunit [default=check]])],
    [request_cunit=$withval], [request_cunit=check])
 AC_ARG_WITH([jemalloc],
    [AS_HELP_STRING([--with-jemalloc],
                    [Use jemalloc [default=check]])],
    [request_jemalloc=$withval], [request_jemalloc=check])
-AC_ARG_WITH([systemd],
+AC_ARG_WITH([spdylay],
-    [AS_HELP_STRING([--with-systemd],
+    [AS_HELP_STRING([--with-spdylay],
-                    [Enable systemd support in nghttpx [default=check]])],
+                    [Use spdylay [default=check]])],
-    [request_systemd=$withval], [request_systemd=check])
+    [request_spdylay=$withval], [request_spdylay=check])
 AC_ARG_WITH([mruby],
    [AS_HELP_STRING([--with-mruby],
@ -162,33 +132,13 @@ AC_ARG_WITH([neverbleed],
                    [Use neverbleed [default=no]])],
    [request_neverbleed=$withval], [request_neverbleed=no])
-AC_ARG_WITH([libngtcp2],
+AC_ARG_WITH([cython],
-    [AS_HELP_STRING([--with-libngtcp2],
+    [AS_HELP_STRING([--with-cython=PATH],
-                    [Use libngtcp2 [default=check]])],
+                    [Use cython in given PATH])],
-    [request_libngtcp2=$withval], [request_libngtcp2=check])
+    [cython_path=$withval], [])
 AC_ARG_WITH([libnghttp3],
    [AS_HELP_STRING([--with-libnghttp3],
                    [Use libnghttp3 [default=check]])],
    [request_libnghttp3=$withval], [request_libnghttp3=check])
 AC_ARG_WITH([libbpf],
    [AS_HELP_STRING([--with-libbpf],
                    [Use libbpf [default=no]])],
    [request_libbpf=$withval], [request_libbpf=no])
 dnl Define variables
-AC_ARG_VAR([LIBEV_CFLAGS], [C compiler flags for libev, skipping any checks])
+AC_ARG_VAR([CYTHON], [the Cython executable])
 AC_ARG_VAR([LIBEV_LIBS], [linker flags for libev, skipping any checks])
 AC_ARG_VAR([JEMALLOC_CFLAGS],
           [C compiler flags for jemalloc, skipping any checks])
 AC_ARG_VAR([JEMALLOC_LIBS], [linker flags for jemalloc, skipping any checks])
 AC_ARG_VAR([LIBTOOL_LDFLAGS],
           [libtool specific flags (e.g., -static-libtool-libs)])
 AC_ARG_VAR([BPFCFLAGS], [C compiler flags for bpf program])
 dnl Checks for programs
 AC_PROG_CC
@ -201,39 +151,46 @@ AC_PROG_MKDIR_P
 PKG_PROG_PKG_CONFIG([0.20])
-AM_PATH_PYTHON([3.8],, [:])
+AM_PATH_PYTHON([2.7],, [:])
 if [test "x$request_lib_only" = "xyes"]; then
  request_app=no
  request_hpack_tools=no
  request_examples=no
-  request_http3=no
+  request_python_bindings=no
  request_libxml2=no
  request_jansson=no
  request_zlib=no
  request_libevent_openssl=no
  request_libcares=no
  request_openssl=no
  request_libev=no
  request_jemalloc=no
  request_systemd=no
  request_mruby=no
  request_neverbleed=no
  request_libngtcp2=no
  request_libnghttp3=no
  request_libbpf=no
 fi
 if [test "x$request_python_bindings" != "xno"]; then
  AX_PYTHON_DEVEL([>= '2.7'])
 fi
 if test "x${cython_path}" = "x"; then
  AC_CHECK_PROGS([CYTHON], [cython.py cython])
 else
  CYTHON=${cython_path}
  AC_SUBST([CYTHON])
 fi
 #
 # If we're running GCC or clang define _U_ to be "__attribute__((unused))"
 # so we can use _U_ to flag unused function parameters and not get warnings
 # about them. Otherwise, define _U_ to be an empty string so that _U_ used
 # to flag an unused function parameters will compile with other compilers.
 #
 # XXX - similar hints for other compilers?
 #
 if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
  AC_DEFINE([_U_], [__attribute__((unused))], [Hint to the compiler that a function parameters is not used])
  AC_DEFINE([NGHTTP2_NORETURN], [__attribute__((noreturn))], [Hint to the compiler that a function never return])
 else
  AC_DEFINE([_U_], , [Hint to the compiler that a function parameter is not used])
  AC_DEFINE([NGHTTP2_NORETURN], , [Hint to the compiler that a function never return])
 fi
 save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
-AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
+AX_CXX_COMPILE_STDCXX_11([noext], [optional])
 CXX1XCXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$save_CXXFLAGS"
@ -253,7 +210,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 ]],
 [[
 std::vector<std::future<int>> v;
 (void)v;
 ]])],
    [AC_DEFINE([HAVE_STD_FUTURE], [1],
               [Define to 1 if you have the `std::future`.])
@ -328,8 +284,8 @@ APPLDFLAGS=
 case "$host_os" in
  *android*)
    android_build=yes
-    # android does not need -pthread, but needs following 2 libs for C++
+    # android does not need -pthread, but needs followng 3 libs for C++
-    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic"
+    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
    ;;
  *)
    PTHREAD_LDFLAGS="-pthread"
@ -343,27 +299,12 @@ case "$host_os" in
    ;;
 esac
 case "${build}" in
  *-apple-darwin*)
    EXTRA_DEFS="-D__APPLE_USE_RFC_3542"
    AC_SUBST([EXTRA_DEFS])
    ;;
 esac
 # zlib
 have_zlib=no
 if test "x${request_zlib}" != "xno"; then
 PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
 if test "x${have_zlib}" = "xno"; then
  AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
 fi
 fi
 if test "x${request_zlib}" = "xyes" &&
   test "x${have_zlib}" != "xyes"; then
  AC_MSG_ERROR([zlib was requested (--with-zlib) but not found])
 fi
 # dl: openssl requires libdl when it is statically linked.
 case "${host_os}" in
@ -378,8 +319,6 @@ case "${host_os}" in
 esac
 # cunit
 have_cunit=no
 if test "x${request_cunit}" != "xno"; then
 PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
 # If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
 # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
@ -405,19 +344,10 @@ if test "x${request_cunit}" != "xno"; then
      ;;
  esac
 fi
 fi
 if test "x${request_cunit}" = "xyes" &&
   test "x${have_cunit}" != "xyes"; then
  AC_MSG_ERROR([cunit was requested (--with-cunit) but not found])
 fi
 AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
 # libev (for src)
 have_libev=no
 if test "x${request_libev}" != "xno"; then
  if test "x${LIBEV_LIBS}" = "x" && test "x${LIBEV_CFLAGS}" = "x"; then
 # libev does not have pkg-config file.  Check it in an old way.
 save_LIBS=$LIBS
 # android requires -lm for floor
@ -427,218 +357,35 @@ if test "x${request_libev}" != "xno"; then
  if test "x${have_libev}" = "xyes"; then
    LIBEV_LIBS=-lev
    LIBEV_CFLAGS=
    AC_SUBST([LIBEV_LIBS])
    AC_SUBST([LIBEV_CFLAGS])
  fi
 fi
 LIBS=$save_LIBS
  else
    have_libev=yes
  fi
 fi
 if test "x${request_libev}" = "xyes" &&
   test "x${have_libev}" != "xyes"; then
  AC_MSG_ERROR([libev was requested (--with-libev) but not found])
 fi
 # openssl (for src)
 have_openssl=no
 if test "x${request_openssl}" != "xno"; then
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
                  [have_openssl=yes], [have_openssl=no])
 if test "x${have_openssl}" = "xno"; then
  AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
  else
    save_CFLAGS="$CFLAGS"
    save_LIBS="$LIBS"
    CFLAGS="$OPENSSL_CFLAGS $CFLAGS"
    LIBS="$OPENSSL_LIBS $LIBS"
    # quictls/openssl has SSL_is_quic.
    have_ssl_is_quic=no
    AC_MSG_CHECKING([for SSL_is_quic])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
      #include <openssl/ssl.h>
    ]], [[
      SSL *ssl = NULL;
      SSL_is_quic(ssl);
    ]])],
    [AC_MSG_RESULT([yes]); have_ssl_is_quic=yes],
    [AC_MSG_RESULT([no]); have_ssl_is_quic=no])
    # boringssl has SSL_set_quic_early_data_context.
    AC_MSG_CHECKING([for SSL_set_quic_early_data_context])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
      #include <openssl/ssl.h>
    ]], [[
      SSL *ssl = NULL;
      SSL_set_quic_early_data_context(ssl, NULL, 0);
    ]])],
    [AC_MSG_RESULT([yes]); have_boringssl_quic=yes],
    [AC_MSG_RESULT([no]); have_boringssl_quic=no])
    CFLAGS="$save_CFLAGS"
    LIBS="$save_LIBS"
  fi
 fi
 if test "x${request_openssl}" = "xyes" &&
   test "x${have_openssl}" != "xyes"; then
  AC_MSG_ERROR([openssl was requested (--with-openssl) but not found])
 fi
 # c-ares (for src)
 have_libcares=no
 if test "x${request_libcares}" != "xno"; then
 PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.5], [have_libcares=yes],
                  [have_libcares=no])
 if test "x${have_libcares}" = "xno"; then
  AC_MSG_NOTICE($LIBCARES_PKG_ERRORS)
 fi
 fi
 if test "x${request_libcares}" = "xyes" &&
   test "x${have_libcares}" != "xyes"; then
  AC_MSG_ERROR([libcares was requested (--with-libcares) but not found])
 fi
 # ngtcp2 (for src)
 have_libngtcp2=no
 if test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.10.0], [have_libngtcp2=yes],
                    [have_libngtcp2=no])
  if test "x${have_libngtcp2}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
  fi
 fi
 if test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2 was requested (--with-libngtcp2) but not found])
 fi
 # ngtcp2_crypto_openssl (for src)
 have_libngtcp2_crypto_openssl=no
 if test "x${have_ssl_is_quic}" = "xyes" &&
   test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_OPENSSL],
                    [libngtcp2_crypto_openssl >= 0.10.0],
                    [have_libngtcp2_crypto_openssl=yes],
                    [have_libngtcp2_crypto_openssl=no])
  if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS)
  else
    AC_DEFINE([HAVE_LIBNGTCP2_CRYPTO_OPENSSL], [1],
              [Define to 1 if you have `libngtcp2_crypto_openssl` library.])
  fi
 fi
 if test "x${have_ssl_is_quic}" = "xyes" &&
   test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2_crypto_openssl}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2_crypto_openssl was requested (--with-libngtcp2) but not found])
 fi
 # ngtcp2_crypto_boringssl (for src)
 have_libngtcp2_crypto_boringssl=no
 if test "x${have_boringssl_quic}" = "xyes" &&
   test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_BORINGSSL],
                    [libngtcp2_crypto_boringssl >= 0.0.0],
                    [have_libngtcp2_crypto_boringssl=yes],
                    [have_libngtcp2_crypto_boringssl=no])
  if test "x${have_libngtcp2_crypto_boringssl}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS)
  else
    AC_DEFINE([HAVE_LIBNGTCP2_CRYPTO_BORINGSSL], [1],
              [Define to 1 if you have `libngtcp2_crypto_boringssl` library.])
  fi
 fi
 if test "x${have_boringssl_quic}" = "xyes" &&
   test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2_crypto_boringssl}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2_crypto_boringssl was requested (--with-libngtcp2) but not found])
 fi
 # nghttp3 (for src)
 have_libnghttp3=no
 if test "x${request_libnghttp3}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 0.7.0], [have_libnghttp3=yes],
                    [have_libnghttp3=no])
  if test "x${have_libnghttp3}" = "xno"; then
    AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS)
  fi
 fi
 if test "x${request_libnghttp3}" = "xyes" &&
   test "x${have_libnghttp3}" != "xyes"; then
  AC_MSG_ERROR([libnghttp3 was requested (--with-libnghttp3) but not found])
 fi
 # libbpf (for src)
 have_libbpf=no
 if test "x${request_libbpf}" != "xno"; then
  PKG_CHECK_MODULES([LIBBPF], [libbpf >= 0.7.0], [have_libbpf=yes],
                    [have_libbpf=no])
  if test "x${have_libbpf}" = "xyes"; then
    AC_DEFINE([HAVE_LIBBPF], [1], [Define to 1 if you have `libbpf` library.])
    if test "x${BPFCFLAGS}" = "x"; then
      BPFCFLAGS="-Wall -O2 -g"
    fi
    # Add the include path for Debian
    EXTRABPFCFLAGS="-I/usr/include/$host_cpu-$host_os"
    AC_SUBST([EXTRABPFCFLAGS])
    AC_MSG_CHECKING([whether enum bpf_stats_type is defined in linux/bpf.h])
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
    [[
    #include <linux/bpf.h>
    ]],
    [[
    enum bpf_stats_type foo;
    (void)foo;
    ]])],
    [have_bpf_stats_type=yes],
    [have_bpf_stats_type=no])
    if test "x${have_bpf_stats_type}" = "xyes"; then
      AC_MSG_RESULT([yes])
      AC_DEFINE([HAVE_BPF_STATS_TYPE], [1],
                [Define to 1 if you have enum bpf_stats_type in linux/bpf.h.])
    else
      AC_MSG_RESULT([no])
    fi
  else
    AC_MSG_NOTICE($LIBBPF_PKG_ERRORS)
  fi
 fi
 if test "x${request_libbpf}" = "xyes" &&
   test "x${have_libbpf}" != "xyes"; then
  AC_MSG_ERROR([libbpf was requested (--with-libbpf) but not found])
 fi
 AM_CONDITIONAL([HAVE_LIBBPF], [ test "x${have_libbpf}" = "xyes" ])
 # libevent_openssl (for examples)
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
 have_libevent_openssl=no
 if test "x${request_libevent_openssl}" != "xno"; then
 PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
                  [have_libevent_openssl=yes], [have_libevent_openssl=no])
 if test "x${have_libevent_openssl}" = "xno"; then
  AC_MSG_NOTICE($LIBEVENT_OPENSSL_PKG_ERRORS)
 fi
 fi
 if test "x${request_libevent_openssl}" = "xyes" &&
   test "x${have_libevent_openssl}" != "xyes"; then
  AC_MSG_ERROR([libevent_openssl was requested (--with-libevent) but not found])
 fi
 # jansson (for src/nghttp, src/deflatehd and src/inflatehd)
 have_jansson=no
 if test "x${request_jansson}" != "xno"; then
 PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
                  [have_jansson=yes], [have_jansson=no])
 if test "x${have_jansson}" = "xyes"; then
@ -647,42 +394,15 @@ if test "x${request_jansson}" != "xno"; then
 else
  AC_MSG_NOTICE($JANSSON_PKG_ERRORS)
 fi
 fi
 if test "x${request_jansson}" = "xyes" &&
   test "x${have_jansson}" != "xyes"; then
  AC_MSG_ERROR([jansson was requested (--with-jansson) but not found])
 fi
 #  libsystemd (for src/nghttpx)
 have_libsystemd=no
 if test "x${request_systemd}" != "xno"; then
  PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [have_libsystemd=yes],
                    [have_libsystemd=no])
  if test "x${have_libsystemd}" = "xyes"; then
    AC_DEFINE([HAVE_LIBSYSTEMD], [1],
              [Define to 1 if you have `libsystemd` library.])
  else
    AC_MSG_NOTICE($SYSTEMD_PKG_ERRORS)
  fi
 fi
 if test "x${request_systemd}" = "xyes" &&
   test "x${have_libsystemd}" != "xyes"; then
  AC_MSG_ERROR([systemd was requested (--with-systemd) but not found])
 fi
 # libxml2 (for src/nghttp)
-have_libxml2=no
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.7.7],
 if test "x${request_libxml2}" != "xno"; then
  PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.26],
                  [have_libxml2=yes], [have_libxml2=no])
 if test "x${have_libxml2}" = "xyes"; then
  AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.])
 else
  AC_MSG_NOTICE($LIBXML2_PKG_ERRORS)
 fi
 fi
 if test "x${request_libxml2}" = "xyes" &&
   test "x${have_libxml2}" != "xyes"; then
@ -694,7 +414,6 @@ AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
 # jemalloc
 have_jemalloc=no
 if test "x${request_jemalloc}" != "xno"; then
  if test "x${JEMALLOC_LIBS}" = "x" && test "x${JEMALLOC_CFLAGS}" = "x"; then
  save_LIBS=$LIBS
  AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
                 [$PTHREAD_LDFLAGS])
@ -716,9 +435,7 @@ if test "x${request_jemalloc}" != "xno"; then
  if test "x${have_jemalloc}" = "xyes" &&
     test "x${jemalloc_libs}" != "xnone required"; then
    JEMALLOC_LIBS=${jemalloc_libs}
-    fi
+    AC_SUBST([JEMALLOC_LIBS])
  else
    have_jemalloc=yes
  fi
 fi
@ -727,6 +444,45 @@ if test "x${request_jemalloc}" = "xyes" &&
  AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
 fi
 # spdylay (for src/nghttpx and src/h2load)
 have_spdylay=no
 if test "x${request_spdylay}" != "xno"; then
  PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.3.2],
                    [have_spdylay=yes], [have_spdylay=no])
  if test "x${have_spdylay}" = "xyes"; then
    AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.])
  else
    AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS)
    AC_MSG_NOTICE([The SPDY support in nghttpx and h2load will be disabled.])
  fi
 fi
 if test "x${request_spdylay}" = "xyes" &&
   test "x${have_spdylay}" != "xyes"; then
  AC_MSG_ERROR([spdylay was requested (--with-spdylay) but not found])
 fi
 AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ])
 # Check Boost Asio library
 have_asio_lib=no
 if test "x${request_asio_lib}" = "xyes"; then
  AX_BOOST_BASE([1.54.0], [have_boost_base=yes], [have_boost_base=no])
  if test "x${have_boost_base}" = "xyes"; then
    AX_BOOST_ASIO()
    AX_BOOST_SYSTEM()
    AX_BOOST_THREAD()
    if test "x${ax_cv_boost_asio}" = "xyes" &&
       test "x${ax_cv_boost_system}" = "xyes" &&
       test "x${ax_cv_boost_thread}" = "xyes"; then
      have_asio_lib=yes
    fi
  fi
 fi
 # The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL,
 # libev, and libc-ares.
 enable_app=no
@ -745,26 +501,6 @@ fi
 AM_CONDITIONAL([ENABLE_APP], [ test "x${enable_app}" = "xyes" ])
 # Check HTTP/3 support
 enable_http3=no
 if test "x${request_http3}" != "xno" &&
   (test "x${have_ssl_is_quic}" = "xyes" ||
    test "x${have_boringssl_quic}" = "xyes") &&
   test "x${have_libngtcp2}" = "xyes" &&
   (test "x${have_libngtcp2_crypto_openssl}" = "xyes" ||
    test "x${have_libngtcp2_crypto_boringssl}" = "xyes") &&
   test "x${have_libnghttp3}" = "xyes"; then
  enable_http3=yes
  AC_DEFINE([ENABLE_HTTP3], [1], [Define to 1 if HTTP/3 is enabled.])
 fi
 if test "x${request_http3}" = "xyes" &&
   test "x${enable_http3}" != "xyes"; then
  AC_MSG_ERROR([HTTP/3 was requested (--enable-http3) but dependencies are not met.])
 fi
 AM_CONDITIONAL([ENABLE_HTTP3], [ test "x${enable_http3}" = "xyes" ])
 enable_hpack_tools=no
 # HPACK tools requires jansson
 if test "x${request_hpack_tools}" != "xno" &&
@ -779,6 +515,16 @@ fi
 AM_CONDITIONAL([ENABLE_HPACK_TOOLS], [ test "x${enable_hpack_tools}" = "xyes" ])
 # C++ library libnghttp2_asio
 enable_asio_lib=no
 if test "x${request_asio_lib}" != "xno" &&
   test "x${have_asio_lib}" = "xyes"; then
  enable_asio_lib=yes
 fi
 AM_CONDITIONAL([ENABLE_ASIO_LIB], [ test "x${enable_asio_lib}" = "xyes" ])
 # The example programs depend on OpenSSL and libevent_openssl
 enable_examples=no
 if test "x${request_examples}" != "xno" &&
@ -801,7 +547,8 @@ have_mruby=no
 have_neverbleed=no
 if test "x${enable_examples}" = "xyes" ||
   test "x${enable_app}" = "xyes" ||
-   test "x${enable_hpack_tools}" = "xyes"; then
+   test "x${enable_hpack_tools}" = "xyes" ||
   test "x${enable_asio_lib}" = "xyes"; then
  enable_third_party=yes
  # mruby (for src/nghttpx)
@ -826,6 +573,27 @@ AM_CONDITIONAL([ENABLE_THIRD_PARTY], [ test "x${enable_third_party}" = "xyes" ])
 AM_CONDITIONAL([HAVE_MRUBY], [test "x${have_mruby}" = "xyes"])
 AM_CONDITIONAL([HAVE_NEVERBLEED], [test "x${have_neverbleed}" = "xyes"])
 # Python bindings
 enable_python_bindings=no
 if test "x${request_python_bindings}" != "xno" &&
   test "x${CYTHON}" != "x" &&
   test "x${PYTHON}" != "x:" &&
   test "x${have_python_dev}" = "xyes"; then
  enable_python_bindings=yes
 fi
 if test "x${request_python_bindings}" = "xyes" &&
   test "x${enable_python_bindings}" != "xyes"; then
  AC_MSG_ERROR([python bindings were requested (--enable-python-bindings) but dependencies are not met.])
 fi
 AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS],
               [test "x${enable_python_bindings}" = "xyes"])
 # Produce cython conditional, so that we can distribute generated C
 # source
 AM_CONDITIONAL([HAVE_CYTHON], [test "x${CYTHON}" != "x"])
 # failmalloc tests
 enable_failmalloc=no
 if test "x${request_failmalloc}" = "xyes"; then
@ -931,7 +699,6 @@ AC_CHECK_FUNCS([ \
  memchr \
  memmove \
  memset \
  mkostemp \
  socket \
  sqrt \
  strchr \
@ -1023,9 +790,6 @@ if test "x$werror" != "xno"; then
    AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"])
    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"])
    AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CXXFLAGS="$CXXFLAGS -Wsometimes-uninitialized"])
    # Disable noexcept-type warning of g++-7.  This is not harmful as
    # long as all source files are compiled with the same compiler.
    AX_CHECK_COMPILE_FLAG([-Wno-noexcept-type], [CXXFLAGS="$CXXFLAGS -Wno-noexcept-type"])
    AC_LANG_POP()
 fi
@ -1072,8 +836,11 @@ AC_CONFIG_FILES([
  tests/testdata/Makefile
  third-party/Makefile
  src/Makefile
-  bpf/Makefile
+  src/includes/Makefile
  src/libnghttp2_asio.pc
  examples/Makefile
  python/Makefile
  python/setup.py
  integration-tests/Makefile
  integration-tests/config.go
  integration-tests/setenv
@ -1086,9 +853,14 @@ AC_CONFIG_FILES([
  doc/tutorial-hpack.rst
  doc/nghttpx-howto.rst
  doc/h2load-howto.rst
  doc/libnghttp2_asio.rst
  doc/python-apiref.rst
  doc/building-android-binary.rst
  doc/nghttp2.h.rst
  doc/nghttp2ver.h.rst
  doc/asio_http2.h.rst
  doc/asio_http2_server.h.rst
  doc/asio_http2_client.h.rst
  doc/contribute.rst
  contrib/Makefile
  script/Makefile
@ -1117,37 +889,36 @@ AC_MSG_NOTICE([summary of build options:
      WARNCXXFLAGS:   ${WARNCXXFLAGS}
      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
      EXTRACFLAG:     ${EXTRACFLAG}
      BPFCFLAGS:      ${BPFCFLAGS}
      EXTRABPFCFLAGS: ${EXTRABPFCFLAGS}
      LIBS:           ${LIBS}
      DEFS:           ${DEFS}
      EXTRA_DEFS:     ${EXTRA_DEFS}
    Library:
      Shared:         ${enable_shared}
      Static:         ${enable_static}
    Libtool:
      LIBTOOL_LDFLAGS: ${LIBTOOL_LDFLAGS}
    Python:
      Python:         ${PYTHON}
      PYTHON_VERSION: ${PYTHON_VERSION}
      pyexecdir:      ${pyexecdir}
      Python-dev:     ${have_python_dev}
      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
      PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
      Cython:         ${CYTHON}
    Test:
      CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
      Failmalloc:     ${enable_failmalloc}
    Libs:
      OpenSSL:        ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
-      Libxml2:        ${have_libxml2} (CFLAGS='${LIBXML2_CFLAGS}' LIBS='${LIBXML2_LIBS}')
+      Libxml2:        ${have_libxml2} (CFLAGS='${LIBXML2_CPPFLAGS}' LIBS='${LIBXML2_LIBS}')
      Libev:          ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
-      Libc-ares:      ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
+      Libc-ares       ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
      libngtcp2:      ${have_libngtcp2} (CFLAGS='${LIBNGTCP2_CFLAGS}' LIBS='${LIBNGTCP2_LIBS}')
      libngtcp2_crypto_openssl: ${have_libngtcp2_crypto_openssl} (CFLAGS='${LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBS}')
      libngtcp2_crypto_boringssl: ${have_libngtcp2_crypto_boringssl} (CFLAGS='${LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_BORINGSSL_LIBS}')
      libnghttp3:     ${have_libnghttp3} (CFLAGS='${LIBNGHTTP3_CFLAGS}' LIBS='${LIBNGHTTP3_LIBS}')
      libbpf:         ${have_libbpf} (CFLAGS='${LIBBPF_CFLAGS}' LIBS='${LIBBPF_LIBS}')
      Libevent(SSL):  ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
      Spdylay:        ${have_spdylay} (CFLAGS='${LIBSPDYLAY_CFLAGS}' LIBS='${LIBSPDYLAY_LIBS}')
      Jansson:        ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
-      Jemalloc:       ${have_jemalloc} (CFLAGS='${JEMALLOC_CFLAGS}' LIBS='${JEMALLOC_LIBS}')
+      Jemalloc:       ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
      Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
-      Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
+      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
      Boost LDFLAGS:  ${BOOST_LDFLAGS}
      Boost::ASIO:    ${BOOST_ASIO_LIB}
      Boost::System:  ${BOOST_SYSTEM_LIB}
      Boost::Thread:  ${BOOST_THREAD_LIB}
    Third-party:
      http-parser:    ${enable_third_party}
      MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
@ -1155,7 +926,8 @@ AC_MSG_NOTICE([summary of build options:
    Features:
      Applications:   ${enable_app}
      HPACK tools:    ${enable_hpack_tools}
      Libnghttp2_asio:${enable_asio_lib}
      Examples:       ${enable_examples}
      Python bindings:${enable_python_bindings}
      Threading:      ${enable_threads}
      HTTP/3 (EXPERIMENTAL): ${enable_http3}
 ])
--- a/contrib/nghttpx.service.in
+++ b/contrib/nghttpx.service.in
@ -1,17 +1,10 @@
 [Unit]
 Description=HTTP/2 proxy
 Documentation=man:nghttpx
 After=network.target
 [Service]
-Type=notify
+Type=forking
-ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf
+ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf --pid-file=/run/nghttpx.pid --daemon
 ExecReload=/bin/kill --signal HUP $MAINPID
 KillSignal=SIGQUIT
 PrivateTmp=yes
 ProtectHome=yes
 ProtectSystem=full
 Restart=always
 [Install]
 WantedBy=multi-user.target
--- a/contrib/tlsticketupdate.go
+++ b/contrib/tlsticketupdate.go
@ -30,10 +30,9 @@ import (
 	"encoding/binary"
 	"flag"
 	"fmt"
 	"github.com/bradfitz/gomemcache/memcache"
 	"log"
 	"time"
 	"github.com/bradfitz/gomemcache/memcache"
 )
 func makeKey(len int) []byte {
@ -90,7 +89,9 @@ func main() {
 			Expiration: int32((*interval) + 300),
 		})
-		<-time.After(time.Duration(*interval) * time.Second)
+		select {
 		case <-time.After(time.Duration(*interval) * time.Second):
 		}
 		// rotate keys.  the last key is now encryption key.
 		// generate new key and append it to the last, so that
--- a/doc/.gitignore
+++ b/doc/.gitignore
@ -1,11 +1,15 @@
 # generated files
 apiref.rst
 asio_http2.h.rst
 asio_http2_client.h.rst
 asio_http2_server.h.rst
 building-android-binary.rst
 conf.py
 contribute.rst
 enums.rst
 h2load-howto.rst
 index.rst
 libnghttp2_asio.rst
 macros.rst
 manual/
 nghttp2.h.rst
@ -13,6 +17,7 @@ nghttp2_*.rst
 nghttp2ver.h.rst
 nghttpx-howto.rst
 package_README.rst
 python-apiref.rst
 tutorial-client.rst
 tutorial-hpack.rst
 tutorial-server.rst
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -42,7 +42,6 @@ set(APIDOCS
  nghttp2_option_set_no_recv_client_magic.rst
  nghttp2_option_set_peer_max_concurrent_streams.rst
  nghttp2_option_set_user_recv_extension_type.rst
  nghttp2_option_set_max_settings.rst
  nghttp2_pack_settings_payload.rst
  nghttp2_priority_spec_check_default.rst
  nghttp2_priority_spec_default_init.rst
@ -50,7 +49,6 @@ set(APIDOCS
  nghttp2_rcbuf_decref.rst
  nghttp2_rcbuf_get_buf.rst
  nghttp2_rcbuf_incref.rst
  nghttp2_rcbuf_is_static.rst
  nghttp2_select_next_protocol.rst
  nghttp2_session_callbacks_del.rst
  nghttp2_session_callbacks_new.rst
@ -180,11 +178,13 @@ set(EXTRA_DIST
  sources/tutorial-hpack.rst
  sources/nghttpx-howto.rst
  sources/h2load-howto.rst
  sources/libnghttp2_asio.rst
  sources/python-apiref.rst
  sources/building-android-binary.rst
  sources/contribute.rst
-  _exts/rubydomain/LICENSE.rubydomain
+  _exts/sphinxcontrib/LICENSE.rubydomain
-  _exts/rubydomain/__init__.py
+  _exts/sphinxcontrib/__init__.py
-  _exts/rubydomain/rubydomain.py
+  _exts/sphinxcontrib/rubydomain.py
  _themes/sphinx_rtd_theme/__init__.py
  _themes/sphinx_rtd_theme/breadcrumbs.html
  _themes/sphinx_rtd_theme/footer.html
@ -267,7 +267,7 @@ add_custom_command(
    apiref.rst
    ${APIDOCS}
  COMMAND
-    "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
+    "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
    apiref.rst macros.rst enums.rst types.rst .
    ${apiref_SOURCES}
  DEPENDS
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -27,12 +27,8 @@ APIDOCS= \
 	macros.rst \
 	enums.rst \
 	types.rst \
 	nghttp2_check_authority.rst \
 	nghttp2_check_header_name.rst \
 	nghttp2_check_header_value.rst \
 	nghttp2_check_header_value_rfc9113.rst \
 	nghttp2_check_method.rst \
 	nghttp2_check_path.rst \
 	nghttp2_hd_deflate_bound.rst \
 	nghttp2_hd_deflate_change_table_size.rst \
 	nghttp2_hd_deflate_del.rst \
@ -66,15 +62,10 @@ APIDOCS= \
 	nghttp2_option_set_max_send_header_block_length.rst \
 	nghttp2_option_set_no_auto_ping_ack.rst \
 	nghttp2_option_set_no_auto_window_update.rst \
 	nghttp2_option_set_no_closed_streams.rst \
 	nghttp2_option_set_no_http_messaging.rst \
 	nghttp2_option_set_no_recv_client_magic.rst \
 	nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation.rst \
 	nghttp2_option_set_peer_max_concurrent_streams.rst \
 	nghttp2_option_set_server_fallback_rfc7540_priorities.rst \
 	nghttp2_option_set_user_recv_extension_type.rst \
 	nghttp2_option_set_max_outbound_ack.rst \
 	nghttp2_option_set_max_settings.rst \
 	nghttp2_pack_settings_payload.rst \
 	nghttp2_priority_spec_check_default.rst \
 	nghttp2_priority_spec_default_init.rst \
@ -82,14 +73,12 @@ APIDOCS= \
 	nghttp2_rcbuf_decref.rst \
 	nghttp2_rcbuf_get_buf.rst \
 	nghttp2_rcbuf_incref.rst \
 	nghttp2_rcbuf_is_static.rst \
 	nghttp2_select_next_protocol.rst \
 	nghttp2_session_callbacks_del.rst \
 	nghttp2_session_callbacks_new.rst \
 	nghttp2_session_callbacks_set_before_frame_send_callback.rst \
 	nghttp2_session_callbacks_set_data_source_read_length_callback.rst \
 	nghttp2_session_callbacks_set_error_callback.rst \
 	nghttp2_session_callbacks_set_error_callback2.rst \
 	nghttp2_session_callbacks_set_on_begin_frame_callback.rst \
 	nghttp2_session_callbacks_set_on_begin_headers_callback.rst \
 	nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst \
@ -109,7 +98,6 @@ APIDOCS= \
 	nghttp2_session_callbacks_set_send_callback.rst \
 	nghttp2_session_callbacks_set_send_data_callback.rst \
 	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
 	nghttp2_session_change_extpri_stream_priority.rst \
 	nghttp2_session_change_stream_priority.rst \
 	nghttp2_session_check_request_allowed.rst \
 	nghttp2_session_check_server_session.rst \
@ -152,7 +140,6 @@ APIDOCS= \
 	nghttp2_session_set_local_window_size.rst \
 	nghttp2_session_set_next_stream_id.rst \
 	nghttp2_session_set_stream_user_data.rst \
 	nghttp2_session_set_user_data.rst \
 	nghttp2_session_terminate_session.rst \
 	nghttp2_session_terminate_session2.rst \
 	nghttp2_session_upgrade.rst \
@ -173,10 +160,8 @@ APIDOCS= \
 	nghttp2_submit_extension.rst \
 	nghttp2_submit_goaway.rst \
 	nghttp2_submit_headers.rst \
 	nghttp2_submit_origin.rst \
 	nghttp2_submit_ping.rst \
 	nghttp2_submit_priority.rst \
 	nghttp2_submit_priority_update.rst \
 	nghttp2_submit_push_promise.rst \
 	nghttp2_submit_request.rst \
 	nghttp2_submit_response.rst \
@ -206,61 +191,27 @@ EXTRA_DIST = \
 	sources/tutorial-hpack.rst \
 	sources/nghttpx-howto.rst \
 	sources/h2load-howto.rst \
 	sources/libnghttp2_asio.rst \
 	sources/python-apiref.rst \
 	sources/building-android-binary.rst \
 	sources/contribute.rst \
-	sources/security.rst \
+	_exts/sphinxcontrib/LICENSE.rubydomain \
-	_exts/rubydomain/LICENSE.rubydomain \
+	_exts/sphinxcontrib/__init__.py \
-	_exts/rubydomain/__init__.py \
+	_exts/sphinxcontrib/rubydomain.py \
 	_exts/rubydomain/rubydomain.py \
 	_themes/sphinx_rtd_theme/__init__.py \
 	_themes/sphinx_rtd_theme/breadcrumbs.html \
 	_themes/sphinx_rtd_theme/footer.html \
 	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo \
+	_themes/sphinx_rtd_theme/layout_old.html \
 	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/sphinx.pot \
 	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/search.html \
 	_themes/sphinx_rtd_theme/searchbox.html \
 	_themes/sphinx_rtd_theme/static/css/badge_only.css \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 \
 	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/js/badge_only.js \
+	_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
 	_themes/sphinx_rtd_theme/static/js/theme.js \
 	_themes/sphinx_rtd_theme/theme.conf \
 	_themes/sphinx_rtd_theme/versions.html \
@ -275,7 +226,7 @@ EXTRA_DIST = \
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   ?= sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = manual
@ -315,7 +266,7 @@ apiref.rst: \
 $(APIDOCS): apiref.rst
 clean-local:
-	if [ $(srcdir) != $(builddir) ]; then for i in $(RST_FILES); do rm -f $(builddir)/$$i; done fi
+	[ $(srcdir) = $(builddir) ] || for i in $(RST_FILES); do [ -e $(builddir)/$$i ] && rm -f $(builddir)/$$i; done
 	-rm -f apiref.rst
 	-rm -f $(APIDOCS)
 	-rm -rf $(BUILDDIR)/*
--- a/doc/_exts/sphinxcontrib/LICENSE.rubydomain
+++ b/doc/_exts/sphinxcontrib/LICENSE.rubydomain
--- a/doc/_exts/sphinxcontrib/init.py
+++ b/doc/_exts/sphinxcontrib/init.py
--- a/doc/_exts/sphinxcontrib/rubydomain.py
+++ b/doc/_exts/sphinxcontrib/rubydomain.py
@ -13,17 +13,18 @@ import re
 from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.parsers.rst import Directive
 from sphinx import addnodes
 from sphinx import version_info
 from sphinx.roles import XRefRole
-from sphinx.locale import _
+from sphinx.locale import l_, _
 from sphinx.domains import Domain, ObjType, Index
 from sphinx.directives import ObjectDescription
 from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
 from sphinx.util.docfields import Field, GroupedField, TypedField
 # REs for Ruby signatures
 rb_sig_re = re.compile(
    r'''^ ([\w.]*\.)?            # class name(s)
@ -64,18 +65,18 @@ class RubyObject(ObjectDescription):
    }
    doc_field_types = [
-        TypedField('parameter', label=_('Parameters'),
+        TypedField('parameter', label=l_('Parameters'),
                   names=('param', 'parameter', 'arg', 'argument'),
                   typerolename='obj', typenames=('paramtype', 'type')),
-        TypedField('variable', label=_('Variables'), rolename='obj',
+        TypedField('variable', label=l_('Variables'), rolename='obj',
                   names=('var', 'ivar', 'cvar'),
                   typerolename='obj', typenames=('vartype',)),
-        GroupedField('exceptions', label=_('Raises'), rolename='exc',
+        GroupedField('exceptions', label=l_('Raises'), rolename='exc',
                     names=('raises', 'raise', 'exception', 'except'),
                     can_collapse=True),
-        Field('returnvalue', label=_('Returns'), has_arg=False,
+        Field('returnvalue', label=l_('Returns'), has_arg=False,
              names=('returns', 'return')),
-        Field('returntype', label=_('Return type'), has_arg=False,
+        Field('returntype', label=l_('Return type'), has_arg=False,
              names=('rtype',)),
    ]
@ -482,8 +483,8 @@ class RubyModuleIndex(Index):
    """
    name = 'modindex'
-    localname = _('Ruby Module Index')
+    localname = l_('Ruby Module Index')
-    shortname = _('modules')
+    shortname = l_('modules')
    def generate(self, docnames=None):
        content = {}
@ -493,7 +494,7 @@ class RubyModuleIndex(Index):
        # list of all modules, sorted by module name
        modules = sorted(_iteritems(self.domain.data['modules']),
                         key=lambda x: x[0].lower())
-        # sort out collapsible modules
+        # sort out collapsable modules
        prev_modname = ''
        num_toplevels = 0
        for modname, (docname, synopsis, platforms, deprecated) in modules:
@ -550,17 +551,17 @@ class RubyDomain(Domain):
    name = 'rb'
    label = 'Ruby'
    object_types = {
-        'function':        ObjType(_('function'),         'func', 'obj'),
+        'function':        ObjType(l_('function'),         'func', 'obj'),
-        'global':          ObjType(_('global variable'),  'global', 'obj'),
+        'global':          ObjType(l_('global variable'),  'global', 'obj'),
-        'method':          ObjType(_('method'),           'meth', 'obj'),
+        'method':          ObjType(l_('method'),           'meth', 'obj'),
-        'class':           ObjType(_('class'),            'class', 'obj'),
+        'class':           ObjType(l_('class'),            'class', 'obj'),
-        'exception':       ObjType(_('exception'),        'exc', 'obj'),
+        'exception':       ObjType(l_('exception'),        'exc', 'obj'),
-        'classmethod':     ObjType(_('class method'),     'meth', 'obj'),
+        'classmethod':     ObjType(l_('class method'),     'meth', 'obj'),
-        'attr_reader':     ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_reader':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_writer':     ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_writer':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_accessor':   ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_accessor':   ObjType(l_('attribute'),        'attr', 'obj'),
-        'const':           ObjType(_('const'),            'const', 'obj'),
+        'const':           ObjType(l_('const'),            'const', 'obj'),
-        'module':          ObjType(_('module'),           'mod', 'obj'),
+        'module':          ObjType(l_('module'),           'mod', 'obj'),
    }
    directives = {
--- a/doc/_themes/sphinx_rtd_theme/init.py
+++ b/doc/_themes/sphinx_rtd_theme/init.py
@ -1,63 +1,17 @@
-"""
+"""Sphinx ReadTheDocs theme.
 Sphinx Read the Docs theme.
 From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
 """
 import os
-from os import path
+VERSION = (0, 1, 9)
 from sys import version_info as python_version
-from sphinx import version_info as sphinx_version
+__version__ = ".".join(str(v) for v in VERSION)
 from sphinx.locale import _
 from sphinx.util.logging import getLogger
 __version__ = '1.0.1alpha1'
 __version_full__ = __version__
 logger = getLogger(__name__)
 def get_html_theme_path():
    """Return list of HTML theme paths."""
-    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
+    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
    return cur_dir
 def config_initiated(app, config):
    theme_options = config.html_theme_options or {}
    if theme_options.get('canonical_url'):
        logger.warning(
            _('The canonical_url option is deprecated, use the html_baseurl option from Sphinx instead.')
        )
 # See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
 def setup(app):
    if python_version[0] < 3:
        logger.warning("Python 2 is deprecated with sphinx_rtd_theme, update to Python 3")
    app.require_sphinx('1.6')
    if sphinx_version <= (2, 0, 0):
        logger.warning("Sphinx 1.x is deprecated with sphinx_rtd_theme, update to Sphinx 2.x or greater")
        if not app.config.html_experimental_html5_writer:
            logger.warning("'html4_writer' is deprecated with sphinx_rtd_theme")
    else:
        if app.config.html4_writer:
            logger.warning("'html4_writer' is deprecated with sphinx_rtd_theme")
    # Register the theme that can be referenced without adding a theme path
    app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
    if sphinx_version >= (1, 8, 0):
        # Add Sphinx message catalog for newer versions of Sphinx
        # See http://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_message_catalog
        rtd_locale_path = path.join(path.abspath(path.dirname(__file__)), 'locale')
        app.add_message_catalog('sphinx', rtd_locale_path)
        app.connect('config-inited', config_initiated)
    # sphinx emits the permalink icon for headers, so choose one more in keeping with our theme
    if sphinx_version >= (3, 5, 0):
        app.config.html_permalinks_icon = "\uf0c1"
    else:
        app.config.html_add_permalinks = "\uf0c1"
    return {'parallel_read_safe': True, 'parallel_write_safe': True}
--- a/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
+++ b/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
@ -1,77 +1,31 @@
-{%- if meta is defined and meta is not none %}
+{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
   {%- set check_meta = True %}
 {%- else %}
   {%- set check_meta = False %}
 {%- endif %}
-{%- if check_meta and 'github_url' in meta %}
+{% if page_source_suffix %} 
-   {%- set display_github = True %}
+{% set suffix = page_source_suffix %}
-{%- endif %}
+{% else %}
 {% set suffix = source_suffix %}
 {% endif %}
-{%- if check_meta and 'bitbucket_url' in meta %}
+<div role="navigation" aria-label="breadcrumbs navigation">
   {%- set display_bitbucket = True %}
 {%- endif %}
 {%- if check_meta and 'gitlab_url' in meta %}
   {%- set display_gitlab = True %}
 {%- endif %}
 {%- set display_vcs_links = display_vcs_links if display_vcs_links is defined else True %}
 {#- Translators: This is an ARIA section label for page links, including previous/next page link and links to GitHub/GitLab/etc. -#}
 <div role="navigation" aria-label="{{ _('Page navigation') }}">
  <ul class="wy-breadcrumbs">
-    {%- block breadcrumbs %}
+    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
-      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
+      {% for doc in parents %}
        {%- for doc in parents %}
        <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-        {%- endfor %}
+      {% endfor %}
    <li>{{ title }}</li>
    {%- endblock %}
    {%- block breadcrumbs_aside %}
    <li class="wy-breadcrumbs-aside">
-        {%- if hasdoc(pagename) and display_vcs_links %}
+      {% if pagename != "search" %}
-          {%- if display_github %}
+        {% if display_github %}
-            {%- if check_meta and 'github_url' in meta %}
+          <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
-              <!-- User defined GitHub URL -->
+        {% elif display_bitbucket %}
-              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
-            {%- else %}
+        {% elif show_source and source_url_prefix %}
-              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+          <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">View page source</a>
-            {%- endif %}
+        {% elif show_source and has_source and sourcename %}
-          {%- elif display_bitbucket %}
+          <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
-            {%- if check_meta and 'bitbucket_url' in meta %}
+        {% endif %}
-              <!-- User defined Bitbucket URL -->
+      {% endif %}
              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
            {%- else %}
              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}?mode={{ theme_vcs_pageview_mode or "view" }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
            {%- endif %}
          {%- elif display_gitlab %}
            {%- if check_meta and 'gitlab_url' in meta %}
              <!-- User defined GitLab URL -->
              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
            {%- else %}
              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode or "blob" }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ page_source_suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
            {%- endif %}
          {%- elif show_source and source_url_prefix %}
            <a href="{{ source_url_prefix }}{{ pagename }}{{ page_source_suffix }}">{{ _('View page source') }}</a>
          {%- elif show_source and has_source and sourcename %}
            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
          {%- endif %}
        {%- endif %}
    </li>
    {%- endblock %}
  </ul>
  {%- if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
  {#- Translators: This is an ARIA section label for sequential page links, such as previous and next page links. -#}
  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="{{ _('Sequential page navigation') }}">
      {%- if prev %}
        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
      {%- endif %}
      {%- if next %}
        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
      {%- endif %}
  </div>
  {%- endif %}
  <hr/>
 </div>
--- a/doc/_themes/sphinx_rtd_theme/footer.html
+++ b/doc/_themes/sphinx_rtd_theme/footer.html
@ -1,62 +1,52 @@
 <footer>
-  {%- if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
+  {% if next or prev %}
-    {#- Translators: This is an ARIA section label for the footer section of the page. -#}
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-    <div class="rst-footer-buttons" role="navigation" aria-label="{{ _('Footer') }}">
+      {% if next %}
-      {%- if prev %}
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
+      {% endif %}
-      {%- endif %}
+      {% if prev %}
-      {%- if next %}
+        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+      {% endif %}
      {%- endif %}
    </div>
-  {%- endif %}
+  {% endif %}
  <hr/>
  <div role="contentinfo">
  {%- block contentinfo %}
    <p>
    {%- if show_copyright %}
      {%- if hasdoc('copyright') %}
-        {%- trans path=pathto('copyright'), copyright=copyright|e %}&#169; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
      {%- else %}
-        {%- trans copyright=copyright|e %}&#169; Copyright {{ copyright }}.{% endtrans %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
      {%- endif %}
    {%- endif %}
    {%- if build_id and build_url %}
      {% trans build_url=build_url, build_id=build_id %}
        <span class="build">
-        {#- Translators: Build is a noun, not a verb -#}
+          Build
        {%- trans %}Build{% endtrans -%}
          <a href="{{ build_url }}">{{ build_id }}</a>.
        </span>
      {% endtrans %}
    {%- elif commit %}
      {% trans commit=commit %}
        <span class="commit">
-        {#- Translators: the phrase "revision" comes from Git, referring to a commit #}
+          Revision <code>{{ commit }}</code>.
        {%- trans %}Revision{% endtrans %} <code>{{ commit }}</code>.
        </span>
      {% endtrans %}
    {%- elif last_updated %}
      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
    {%- endif %}
    {%- if last_updated %}
      <span class="lastupdated">
        {%- trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
      </span>
    {%- endif -%}
    </p>
  {%- endblock %}
  </div>
-  {% if show_sphinx %}
+  {%- if show_sphinx %}
-    {%- set sphinx_web = '<a href="https://www.sphinx-doc.org/">Sphinx</a>' %}
+  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-    {%- set readthedocs_web = '<a href="https://readthedocs.org">Read the Docs</a>'  %}
+  {%- endif %}
    {#- Translators: the variable "sphinx_web" is a link to the Sphinx project documentation with the text "Sphinx" #}
    {%- trans sphinx_web=sphinx_web, readthedocs_web=readthedocs_web %}Built with {{ sphinx_web }} using a{% endtrans %}
    {#- Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documentation #}
    <a href="https://github.com/readthedocs/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
    {#- Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
    {% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
  {% endif %}
  {%- block extrafooter %} {% endblock %}
 </footer>
--- a/doc/_themes/sphinx_rtd_theme/layout.html
+++ b/doc/_themes/sphinx_rtd_theme/layout.html
@ -6,106 +6,54 @@
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
 {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
 {%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' -%}
 {# Build sphinx_version_info tuple from sphinx_version string in pure Jinja #}
 {%- set (_ver_major, _ver_minor, _ver_bugfix) = sphinx_version.split('.') | map('int') -%}
 {%- set sphinx_version_info = (_ver_major, _ver_minor, _ver_bugfix) -%}
 <!DOCTYPE html>
-<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
-  <meta charset="utf-8" />
+  <meta charset="utf-8">
-  {{- metatags }}
+  {{ metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {%- block htmltitle %}
+  {% block htmltitle %}
  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {%- endblock -%}
+  {% endblock %}
-  {#- CSS #}
+  {# FAVICON #}
-  {%- if sphinx_version_info < (4, 0) -%}
+  {% if favicon %}
    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
  {%- endif %}
  {%- for css in css_files %}
    {%- if css|attr("rel") %}
      <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
    {%- else %}
      <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
    {%- endif %}
  {%- endfor %}
  {%- for cssfile in extra_css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
  {%- endfor -%}
  {#- FAVICON #}
  {%- if favicon %}
    {%- if sphinx_version_info < (4, 0) -%}
    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-    {%- else %}
+  {% endif %}
    <link rel="shortcut icon" href="{{ favicon_url }}"/>
    {%- endif %}
  {%- endif -%}
-  {#- CANONICAL URL (deprecated) #}
+  {# CSS #}
  {%- if theme_canonical_url and not pageurl %}
    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
  {%- endif -%}
-  {#- CANONICAL URL #}
+  {# OPENSEARCH #}
-  {%- if pageurl %}
+  {% if not embedded %}
-    <link rel="canonical" href="{{ pageurl|e }}" />
+    {% if use_opensearch %}
-  {%- endif -%}
+      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
    {% endif %}
-  {#- JAVASCRIPTS #}
+  {% endif %}
  {%- block scripts %}
  <!--[if lt IE 9]>
    <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
  <![endif]-->
  {%- if not embedded %}
  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
    {%- if sphinx_version_info >= (1, 8) -%}
      {%- if sphinx_version_info < (4, 0) -%}
      <script id="documentation_options" data-url_root="{{ url_root }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
      {%- endif -%}
      {%- for scriptfile in script_files %}
        {{ js_tag(scriptfile) }}
      {%- endfor %}
    {%- else %}
      <script>
          var DOCUMENTATION_OPTIONS = {
              URL_ROOT:'{{ url_root }}',
              VERSION:'{{ release|e }}',
              LANGUAGE:'{{ language }}',
              COLLAPSE_INDEX:false,
              FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
              HAS_SOURCE:  {{ has_source|lower }},
              SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
          };
      </script>
      {%- for scriptfile in script_files %}
        <script src="{{ pathto(scriptfile, 1) }}"></script>
      {%- endfor %}
    {%- endif %}
    <script src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-    {#- OPENSEARCH #}
+  {# RTD hosts this file, so just load on non RTD builds #}
-    {%- if use_opensearch %}
+  {% if not READTHEDOCS %}
-    <link rel="search" type="application/opensearchdescription+xml"
+    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
+  {% endif %}
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+
-    {%- endif %}
+  {% for cssfile in css_files %}
-  {%- endif %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {%- endblock %}
+  {% endfor %}
  {% for cssfile in extra_css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
  {% endfor %}
  {%- block linktags %}
    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
+        <link rel="author" title="{{ _('About these documents') }}"
              href="{{ pathto('about') }}"/>
    {%- endif %}
    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
+        <link rel="index" title="{{ _('Index') }}"
              href="{{ pathto('genindex') }}"/>
    {%- endif %}
    {%- if hasdoc('search') %}
        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
@ -113,6 +61,10 @@
    {%- if hasdoc('copyright') %}
        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
    {%- endif %}
    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
    {%- if parents %}
        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
    {%- endif %}
    {%- if next %}
        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
    {%- endif %}
@ -121,135 +73,123 @@
    {%- endif %}
  {%- endblock %}
  {%- block extrahead %} {% endblock %}
  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
 </head>
-<body class="wy-body-for-nav">
+<body class="wy-body-for-nav" role="document">
-  {%- block extrabody %} {% endblock %}
+  {% block extrabody %} {% endblock %}
  <div class="wy-grid-for-nav">
-    {#- SIDE NAV, TOGGLES ON MOBILE #}
+
    {# SIDE NAV, TOGGLES ON MOBILE #}
    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
+        <div class="wy-side-nav-search">
-          {%- block sidebartitle %}
+          {% block sidebartitle %}
-          {%- if logo and theme_logo_only %}
+          {% if logo and theme_logo_only %}
            <a href="{{ pathto(master_doc) }}">
-          {%- else %}
+          {% else %}
            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-          {%- endif %}
+          {% endif %}
-          {%- if logo %}
+          {% if logo %}
-            {#- Not strictly valid HTML, but it's the only way to display/scale
+            {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-                it properly, without weird scripting or heaps of work
+            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
-            #}
+          {% endif %}
            {%- if sphinx_version_info < (4, 0) -%}
            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="{{ _('Logo') }}"/>
            {%- else %}
            <img src="{{ logo_url }}" class="logo" alt="{{ _('Logo') }}"/>
            {%- endif %}
          {%- endif %}
          </a>
-          {%- if theme_display_version %}
+          {% if theme_display_version %}
            {%- set nav_version = version %}
-            {%- if READTHEDOCS and current_version %}
+            {% if READTHEDOCS and current_version %}
              {%- set nav_version = current_version %}
-            {%- endif %}
+            {% endif %}
-            {%- if nav_version %}
+            {% if nav_version %}
              <div class="version">
                {{ nav_version }}
              </div>
-            {%- endif %}
+            {% endif %}
-          {%- endif %}
+          {% endif %}
-          {%- include "searchbox.html" %}
+          {% include "searchbox.html" %}
-          {%- endblock %}
+          {% endblock %}
        </div>
-        {%- block navigation %}
+        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        {#- Translators: This is an ARIA section label for the main navigation menu -#}
+          {% block menu %}
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="{{ _('Navigation menu') }}">
+            {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
-          {%- block menu %}
+            {% if toctree %}
            {%- set toctree = toctree(maxdepth=theme_navigation_depth|int,
                                      collapse=theme_collapse_navigation|tobool,
                                      includehidden=theme_includehidden|tobool,
                                      titles_only=theme_titles_only|tobool) %}
            {%- if toctree %}
                {{ toctree }}
-            {%- else %}
+            {% else %}
                <!-- Local TOC -->
                <div class="local-toc">{{ toc }}</div>
-            {%- endif %}
+            {% endif %}
-          {%- endblock %}
+          {% endblock %}
        </div>
        {%- endblock %}
      </div>
    </nav>
    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-      {#- MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
+      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      {#- Translators: This is an ARIA section label for the navigation menu that is visible when viewing the page on mobile devices -#}
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
      <nav class="wy-nav-top" aria-label="{{ _('Mobile navigation menu') }}" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
        {%- block mobile_nav %}
        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
        {%- endblock %}
      </nav>
      {# PAGE CONTENT #}
      <div class="wy-nav-content">
      {%- block content %}
        {%- if theme_style_external_links|tobool %}
        <div class="rst-content style-external-links">
        {%- else %}
        <div class="rst-content">
        {%- endif %}
          {% include "breadcrumbs.html" %}
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
          {%- block document %}
           <div itemprop="articleBody">
            {% block body %}{% endblock %}
           </div>
           {%- if self.comments()|trim %}
             <div class="articleComments">
               {%- block comments %}{% endblock %}
          </div>
           {%- endif%}
          </div>
          {%- endblock %}
          {% include "footer.html" %}
        </div>
      {%- endblock %}
      </div>
    </section>
  </div>
-  {% include "versions.html" -%}
+  {% include "versions.html" %}
-  <script>
+  {% if not embedded %}
    <script type="text/javascript">
        var DOCUMENTATION_OPTIONS = {
            URL_ROOT:'{{ url_root }}',
            VERSION:'{{ release|e }}',
            COLLAPSE_INDEX:false,
            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
            HAS_SOURCE:  {{ has_source|lower }}
        };
    </script>
    {%- for scriptfile in script_files %}
      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
    {%- endfor %}
  {% endif %}
  {# RTD hosts this file, so just load on non RTD builds #}
  {% if not READTHEDOCS %}
    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
  {% endif %}
  {# STICKY NAVIGATION #}
  {% if theme_sticky_navigation %}
  <script type="text/javascript">
      jQuery(function () {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
+          SphinxRtdTheme.StickyNav.enable();
      });
  </script>
-
+  {% endif %}
  {#- Do not conflict with RTD insertion of analytics script #}
  {%- if not READTHEDOCS %}
    {%- if theme_analytics_id %}
    <!-- Theme Analytics -->
    <script async src="https://www.googletagmanager.com/gtag/js?id={{ theme_analytics_id }}"></script>
    <script>
      window.dataLayer = window.dataLayer || [];
      function gtag(){dataLayer.push(arguments);}
      gtag('js', new Date());
      gtag('config', '{{ theme_analytics_id }}', {
          'anonymize_ip': {{ 'true' if theme_analytics_anonymize_ip|tobool else 'false' }},
      });
    </script>
    {%- endif %}
  {%- endif %}
  {%- block footer %} {% endblock %}
--- a/doc/_themes/sphinx_rtd_theme/layout_old.html
+++ b/doc/_themes/sphinx_rtd_theme/layout_old.html
@ -0,0 +1,205 @@
 {#
    basic/layout.html
    ~~~~~~~~~~~~~~~~~
    Master layout template for Sphinx themes.
    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
    :license: BSD, see LICENSE for details.
 #}
 {%- block doctype -%}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
 {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
                         (sidebars != []) %}
 {%- set url_root = pathto('', 1) %}
 {# XXX necessary? #}
 {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 {%- if not embedded and docstitle %}
  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
 {%- macro relbar() %}
    <div class="related">
      <h3>{{ _('Navigation') }}</h3>
      <ul>
        {%- for rellink in rellinks %}
        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
        {%- endfor %}
        {%- block rootrellink %}
        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
        {%- endblock %}
        {%- for parent in parents %}
          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
        {%- endfor %}
        {%- block relbaritems %} {% endblock %}
      </ul>
    </div>
 {%- endmacro %}
 {%- macro sidebar() %}
      {%- if render_sidebar %}
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
          {%- block sidebarlogo %}
          {%- if logo %}
            <p class="logo"><a href="{{ pathto(master_doc) }}">
              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
            </a></p>
          {%- endif %}
          {%- endblock %}
          {%- if sidebars != None %}
            {#- new style sidebar: explicitly include/exclude templates #}
            {%- for sidebartemplate in sidebars %}
            {%- include sidebartemplate %}
            {%- endfor %}
          {%- else %}
            {#- old style sidebars: using blocks -- should be deprecated #}
            {%- block sidebartoc %}
            {%- include "localtoc.html" %}
            {%- endblock %}
            {%- block sidebarrel %}
            {%- include "relations.html" %}
            {%- endblock %}
            {%- block sidebarsourcelink %}
            {%- include "sourcelink.html" %}
            {%- endblock %}
            {%- if customsidebar %}
            {%- include customsidebar %}
            {%- endif %}
            {%- block sidebarsearch %}
            {%- include "searchbox.html" %}
            {%- endblock %}
          {%- endif %}
        </div>
      </div>
      {%- endif %}
 {%- endmacro %}
 {%- macro script() %}
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '{{ url_root }}',
        VERSION:     '{{ release|e }}',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
        HAS_SOURCE:  {{ has_source|lower }}
      };
    </script>
    {%- for scriptfile in script_files %}
    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
    {%- endfor %}
 {%- endmacro %}
 {%- macro css() %}
    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
    {%- for cssfile in css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
    {%- endfor %}
 {%- endmacro %}
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
    {{ metatags }}
    {%- block htmltitle %}
    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
    {%- endblock %}
    {{ css() }}
    {%- if not embedded %}
    {{ script() }}
    {%- if use_opensearch %}
    <link rel="search" type="application/opensearchdescription+xml"
          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
    {%- endif %}
    {%- if favicon %}
    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
    {%- endif %}
    {%- endif %}
 {%- block linktags %}
    {%- if hasdoc('about') %}
    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
    {%- endif %}
    {%- if hasdoc('genindex') %}
    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
    {%- endif %}
    {%- if hasdoc('search') %}
    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
    {%- endif %}
    {%- if hasdoc('copyright') %}
    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
    {%- endif %}
    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
    {%- if parents %}
    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
    {%- endif %}
    {%- if next %}
    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
    {%- endif %}
    {%- if prev %}
    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
    {%- endif %}
 {%- endblock %}
 {%- block extrahead %} {% endblock %}
  </head>
  <body>
 {%- block header %}{% endblock %}
 {%- block relbar1 %}{{ relbar() }}{% endblock %}
 {%- block content %}
  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
    <div class="document">
  {%- block document %}
      <div class="documentwrapper">
      {%- if render_sidebar %}
        <div class="bodywrapper">
      {%- endif %}
          <div class="body">
            {% block body %} {% endblock %}
          </div>
      {%- if render_sidebar %}
        </div>
      {%- endif %}
      </div>
  {%- endblock %}
  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
      <div class="clearer"></div>
    </div>
 {%- endblock %}
 {%- block relbar2 %}{{ relbar() }}{% endblock %}
 {%- block footer %}
    <div class="footer">
    {%- if show_copyright %}
      {%- if hasdoc('copyright') %}
        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
      {%- else %}
        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
      {%- endif %}
    {%- endif %}
    {%- if last_updated %}
      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
    {%- endif %}
    {%- if show_sphinx %}
      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
    {%- endif %}
    </div>
    <p>asdf asdf asdf asdf 22</p>
 {%- endblock %}
  </body>
 </html>
--- a/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
@ -1,136 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Tom Kunze <transifex.com@tomabrafix.de>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
 "Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Auf GitHub bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Auf Bitbucket bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Auf GitLab bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Quelltext anzeigen"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Zurück"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Weiter"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Build"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Zuletzt aktualisiert am %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Erstellt mit %(sphinx_web)s mit einem"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "bereitgestellt von %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "%(docstitle)s durchsuchen"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Über diese Dokumentation"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Suche"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Copyright"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Bitte aktiviere JavaScript, um die Suchfunktion zu nutzen."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Suchergebnisse"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Es wurden keine mit deiner Suchanfrage übereinstimmenden Dokumente gefunden."
 " Achte darauf, dass alle Wörter richtig geschrieben sind und dass genug "
 "Kategorien ausgewählt sind."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Dokumentation durchsuchen"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versionen"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Auf Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projektübersicht"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Builds"
--- a/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
@ -1,201 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 15:43-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr ""
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr ""
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr ""
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr ""
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr ""
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr ""
 #. the variable "sphinx_web" is a link to the Sphinx project documentation with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr ""
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr ""
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr ""
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr ""
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr ""
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr ""
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words "
 "are spelled correctly and that you've selected enough categories."
 msgstr ""
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr ""
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr ""
 #~ msgid "Docs"
 #~ msgstr ""
 #~ msgid "Free document hosting provided by"
 #~ msgstr ""
 #~ msgid "Documentation Home"
 #~ msgstr ""
 #~ msgid "Breadcrumbs"
 #~ msgstr ""
 #~ msgid "Main"
 #~ msgstr ""
 #~ msgid "Top"
 #~ msgstr ""
--- a/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
@ -1,168 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2019
 # Radina Matic <radina.matic@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Radina Matic <radina.matic@gmail.com>, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Editar en GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Editar en Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Editar en GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Ver código fuente de la página"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Anterior"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Siguiente"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Pie de página"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Derechos de autor</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Derechos de autor %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Compilación"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Revisión"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Actualizado por última vez el %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilado con %(sphinx_web)s usando un"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "proporcionado por %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Buscar en %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Sobre esta documentación"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Índice"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Búsqueda"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Derechos de autor"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logotipo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Por favor, active JavaScript para habilitar la funcionalidad de búsqueda."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Su búsqueda no coincide con ningún documento. Por favor, asegúrese de que "
 "todas las palabras estén correctamente escritas y que usted haya "
 "seleccionado las suficientes categorías."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Buscar documentos"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versiones"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Descargas"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "En Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Página de Proyecto"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Compilaciones"
--- a/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
@ -1,166 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2020
 # Ivar Smolin <okul@linux.ee>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>, 2021\n"
 "Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Muuda GitHubis"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Muuda Bitbucketis"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Muuda GitLabis"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Vaata lehe lähtekoodi"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Eelmine"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Järgmine"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Jalus"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Autoriõigus</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Autoriõigus %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Ehitus"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Redaktsioon"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Viimati uuendatud  %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Ehitatud %(sphinx_web)s'iga,"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "kujundusteema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "on loonud %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Otsi dokumendist %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Nende dokumentide kirjeldused"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Indeks"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Otsing"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Autoriõigus"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Otsimisfunktsiooni lubamiseks aktiveeri palun JavaScript"
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Otsingu tulemused"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Sinu otsingule ei vastanud ükski dokument. Palun veendu, et kõik sisestatud "
 "sõnad on õigesti kirjutatud ja sa oled valikud piisaval hulgal kategooriaid."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Otsi dokumente"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versioonid"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Allalaadimised"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Saidil Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projekti kodu"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Ehitused"
--- a/doc/_themes/sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/fa_IR/LC_MESSAGES/sphinx.po
@ -1,160 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Anthony <aj@ohess.org>, 2021\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/readthedocs/teams/101354/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "ویرایش در GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "ویرایش در Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "ویرایش در GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "نمایش متن منبع صفحه"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "پیشین"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "بعدی"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">حق انتشار</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; حق انتشار%(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "ساخت"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "بازبینی"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "آخرین بروز رسانی در %(last_updated)s ."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "ساخته شده با %(sphinx_web)s"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "پوسته"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "تهیّه شده با %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "جستجو در %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "درباره این مستندات"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "فهرست"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "جستجوی"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "کپی رایت"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "آرم"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "لطفاً جاوا اسکریپت را فعّال کنید تا قابلیّت جستجو فعّال شود."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "نتایج جستجو"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "جستجوی شما با هیچ سندی مطابقت نداشت. لطفاً از درستی املای واژگان مطمئن شوید."
 " هم‌چنین بررسی کنید آیا به اندازه کافی دسته بندی انتخاب کرده‌اید."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "جستجوی مستندات"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "نگارش‌ها"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "بارگیری‌ها"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "درباره‌ی خواندن مستندات"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "صفحه خانگی پروژه"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "ساخت‌ها"
--- a/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po
@ -1,167 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2020
 # Radina Matic <radina.matic@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Radina Matic <radina.matic@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/readthedocs/teams/101354/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Éditer sur GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Éditer sur Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Éditer sur GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Afficher la source de la page"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Précédent"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Suivant"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Pied de page"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Droits d'auteur</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Droits d'auteur %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Compilation"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Révision"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Dernière mise à jour le %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilé avec %(sphinx_web)s en utilisant un"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "thème"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fourni par %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Rechercher dans %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "À propos de cette documentation"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Rechercher"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Droits d'auteur"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Activez JavaScript pour accéder à la fonction de recherche."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Votre recherche ne correspond à aucun document. Assurez-vous que tous les "
 "mots sont correctement orthographiés et que vous avez sélectionné "
 "suffisamment de catégories."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Rechercher docs"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versions"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Téléchargements"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "À propos de Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Accueil du projet"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Compilations"
--- a/doc/_themes/sphinx_rtd_theme/locale/it/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/it/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/it/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/it/LC_MESSAGES/sphinx.po
@ -1,190 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2021
 # Maurizio Paglia <mpaglia0@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Maurizio Paglia <mpaglia0@gmail.com>, 2021\n"
 "Language-Team: Italian (https://www.transifex.com/readthedocs/teams/101354/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Naviga tra le pagine"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Modifica su GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Modifica su Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Modifica su GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Visualizza sorgente pagina"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Naviga sequenzialmente tra le pagine"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Precedente"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Prossimo"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Piè di pagina"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Copyright %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Rev."
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Revisione"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Ultimo aggiornamento il %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Realizzato con %(sphinx_web)s e il tema"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fornito da %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Cerca in %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Nota sulla documentazione"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Indice"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Ricerca"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Copyright"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Menu di navigazione"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Menu navigazione dispositivi mobili"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Devi attivare JavaScript per attivare la funzione di ricerca."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "La tua ricerca non ha prodotto nessun risultato. Assicurati di aver scritto "
 "correttamente tutti i termini cercati e di aver selezionato sufficienti "
 "categorie."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Cerca documenti"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versioni"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Downloads"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Riguardo Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Home progetto"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Rev."
--- a/doc/_themes/sphinx_rtd_theme/locale/lt/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/lt/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/lt/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/lt/LC_MESSAGES/sphinx.po
@ -1,188 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Tomas Straupis, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Tomas Straupis, 2021\n"
 "Language-Team: Lithuanian (https://www.transifex.com/readthedocs/teams/101354/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: lt\n"
 "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Puslapių navigacija"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Keisti GitHub'e"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Keisti Bitbucket'e"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Keisti GitLab'e"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Žiūrėti puslapio šaltinį"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Puslapių navigacija iš eilės"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Ankstesnis"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Kitas"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Poraštė"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Copyright %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Surinkimas"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Versija"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Atnaujinta %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Surinkta su %(sphinx_web)s naudojant"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "temą"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "pateiktą %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Ieškoti %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Apie šiuos dokumentus"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Indeksas"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Paieška"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Autorių teisės"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Navigacijos meniu"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Mobilios navigacijos meniu"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Prašome įjungti JavaScript, kad veiktų paieškos funkcionalumas."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Paieškos rezultatai"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Jūsų paieškai neatitiko nei vienas dokumentas. Prašome įsitikinti, kad visi "
 "žodžiai parašyti teisingai ir kad parinkote pakankamai kategorijų."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Ieškoti dokumentuose"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versijos"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Atsisiuntimai"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Apie Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projekto namai"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Surinkimai"
--- a/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po
@ -1,188 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Jesse Tan, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Jesse Tan, 2021\n"
 "Language-Team: Dutch (https://www.transifex.com/readthedocs/teams/101354/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Paginanavigatie"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Bewerk op GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Bewerk op BitBucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Bewerk op GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Bekijk paginabron"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Navigatie voor gerelateerde pagina's"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Vorige"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Volgende"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Voettekst"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Copyright %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Bouwresultaat"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Revisie"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Laatste update op %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Gebouwd met %(sphinx_web)s met een"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "thema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "geleverd door %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Zoek binnen %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Over deze documenten"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Zoek"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Copyright"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Navigatiemenu"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Navigatiemenu voor mobiel"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Zet JavaScript aan om de zoekfunctie mogelijk te maken."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Zoekresultaten"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Zoekpoging vond geen documenten. Zorg ervoor dat alle woorden correct zijn "
 "gespeld en dat voldoende categorieën zijn geselecteerd."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Zoek in documentatie"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versies"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Downloads"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Op Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Project Home"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Bouwresultaten"
--- a/doc/_themes/sphinx_rtd_theme/locale/pl/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/pl/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/pl/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/pl/LC_MESSAGES/sphinx.po
@ -1,137 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Michal Sniatala, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Michal Sniatala, 2021\n"
 "Language-Team: Polish (https://www.transifex.com/readthedocs/teams/101354/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Edytuj na GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Edytuj na Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Edytuj na GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Zobacz źródło strony"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Poprzedni"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Następny"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Prawa zastrzeżone</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Prawa zastrzeżone %(copyright)s."
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Ostatnia aktualizacja %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Zbudowano w %(sphinx_web)s używając"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "dostarczone przez %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Szukaj w %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "O tych dokumentach"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Indeks"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Szukaj"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Prawa zastrzeżone"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Proszę aktywować obsługę JavaScript, aby włączyć funkcję wyszukiwania."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Wyniki wyszukiwania"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Nie znaleziono szukanej frazy. Upewnij się, że wszystkie słowa są napisane "
 "poprawnie i że wybrałeś wystarczającą liczbę kategorii."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Szukaj"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Wersje"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Pobrania"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Na Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Strona projektu"
--- a/doc/_themes/sphinx_rtd_theme/locale/pt/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/pt/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt/LC_MESSAGES/sphinx.po
@ -1,161 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Ana Costa <anacosta.xl@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Ana Costa <anacosta.xl@gmail.com>, 2021\n"
 "Language-Team: Portuguese (https://www.transifex.com/readthedocs/teams/101354/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Navegação da página"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Editar no GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Editar no Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Editar no GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Ver código-fonte da página"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Navegação sequencial da página"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Anterior"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Seguinte"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Rodapé"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Revisão"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Última actualização em %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilado com %(sphinx_web)s usando um"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fornecido por %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Procurar em %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Sobre estes documentos"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Índice"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Pesquisar"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Menu de navegação"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Menu de navegação móvel"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Por favor, active o JavaScript para permitir a função de pesquisa."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Resultados de Pesquisa"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "A sua pesquisa não encontrou nenhum documento. Por favor confirme que todas "
 "as palavras estão bem escritas e que selecionou categorias suficientes."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Pesquisar docs"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versões"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Transferências"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "No Read the Docs"
--- a/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po
@ -1,191 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2021
 # Wellington Uemura <wellingtonuemura@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Wellington Uemura <wellingtonuemura@gmail.com>, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/readthedocs/teams/101354/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Navegação da página"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Editar no GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Editar no Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Editar no GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Ver código-fonte da página"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Navegação sequencial da página"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Anterior"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Próximo"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Rodapé"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Direitos autorais</a> %(copyright)s."
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Direitos autorais %(copyright)s."
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Compilação"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Revisão"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Última atualização em %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilado com %(sphinx_web)s usando um"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fornecido por %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Pesquisar em %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Sobre esses documentos"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Índice"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Pesquisar"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Copyright"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Menu de navegação"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Menu de navegação móvel"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Por favor, ative JavaScript para habilitar a funcionalidade de pesquisa."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Resultados da pesquisa"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "A sua pesquisa não encontrou nenhum documento correspondente. Verifique se "
 "todas as palavras estão escritas corretamente e se você selecionou "
 "categorias suficientes."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Pesquisar documentos"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versões"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Downloads"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "No Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Página inicial"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Compilações"
--- a/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po
@ -1,189 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # lvv83 <vlozhkin83@gmail.com>, 2019
 # Dmitry Shachnev <mitya57@gmail.com>, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Dmitry Shachnev <mitya57@gmail.com>, 2021\n"
 "Language-Team: Russian (https://www.transifex.com/readthedocs/teams/101354/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr "Навигация по страницам"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Редактировать на GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Редактировать на BitBucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Редактировать на GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Просмотреть исходный код страницы"
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr "Навигация по соседним страницам"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Предыдущая"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Следующая"
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr "Нижняя область"
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr "&#169; <a href=\"%(path)s\">Авторские права</a> %(copyright)s. "
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr "&#169; Авторские права %(copyright)s. "
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Сборка"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Ревизия"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Последний раз обновлено %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Собрано при помощи %(sphinx_web)s с использованием"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "темы,"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "предоставленной %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Поиск в %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Об этих документах"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Алфавитный указатель"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Поиск"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Авторские права"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Логотип"
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr "Меню навигации"
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr "Меню навигации для мобильных устройств"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Активируйте JavaScript, чтобы использовать функционал поиска."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Результаты поиска"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "По Вашему запросу не найдено результатов. Пожалуйста, проверьте, что все "
 "слова написаны правильно, и Вы выбрали нужные категории."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Поиск в документации"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Версии"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Загрузки"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "На Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Домашняя страница проекта"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Сборки"
--- a/doc/_themes/sphinx_rtd_theme/locale/sphinx.pot
+++ b/doc/_themes/sphinx_rtd_theme/locale/sphinx.pot
@ -1,182 +0,0 @@
 # Translations template for sphinx_rtd_theme.
 # Copyright (C) 2021 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 1.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 #. This is an ARIA section label for page links, including previous/next page
 #. link and links to GitHub/GitLab/etc.
 #: sphinx_rtd_theme/breadcrumbs.html:22
 msgid "Page navigation"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr ""
 #. This is an ARIA section label for sequential page links, such as previous
 #. and next page links.
 #: sphinx_rtd_theme/breadcrumbs.html:67
 msgid "Sequential page navigation"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr ""
 #. This is an ARIA section label for the footer section of the page.
 #: sphinx_rtd_theme/footer.html:4
 msgid "Footer"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:21
 #, python-format
 msgid "&#169; <a href=\"%(path)s\">Copyright</a> %(copyright)s."
 msgstr ""
 #: sphinx_rtd_theme/footer.html:23
 #, python-format
 msgid "&#169; Copyright %(copyright)s."
 msgstr ""
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr ""
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr ""
 #. the variable "sphinx_web" is a link to the Sphinx project documentation with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr ""
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr ""
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr ""
 #. This is an ARIA section label for the main navigation menu
 #: sphinx_rtd_theme/layout.html:173
 msgid "Navigation menu"
 msgstr ""
 #. This is an ARIA section label for the navigation menu that is visible when
 #. viewing the page on mobile devices
 #: sphinx_rtd_theme/layout.html:195
 msgid "Mobile navigation menu"
 msgstr ""
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr ""
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words "
 "are spelled correctly and that you've selected enough categories."
 msgstr ""
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr ""
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr ""
--- a/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po
@ -1,151 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/readthedocs/teams/101354/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "Editera på GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Editera på Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "Editera på GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Visa sidkälla"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Tillbaka"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Nästa"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Bygg"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Ändra"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Senast uppdaterad %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Gjord med %(sphinx_web)s med hjälp av"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "erhållet av %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Sök i %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Om dessa dokument"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Sök"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Upphovsrätt"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Var vänlig och aktivera JavaScript för att möjliggöra sökfunktionaliteten."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Sökresultat"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Din sökning gav inga träffar. Var vänlig och se till att alla ord är rätt "
 "stavade och att du har valt tillräckligt många kategorier."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Sök i dokumentationen"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versioner"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Nerladdningar"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "På Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projekt Hem"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Versioner"
--- a/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po
@ -1,143 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # BouRock, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: BouRock, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/readthedocs/teams/101354/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "GitHub'da Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "Bitbucket'ta Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "GitLab'ta Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "Sayfa kaynağını görüntüle"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "Önceki"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "Sonraki"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "Oluşturma"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "Gözden geçirme"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Son olarak %(last_updated)s tarihinde güncellendi."
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "kullanılarak %(readthedocs_web)s tarafından sağlanmasıyla oluşturuldu"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "%(docstitle)s içinde ara"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "Bu belgeler hakkında"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "Dizin"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Arama"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "Telif hakkı"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Arama işlevselliğini etkinleştirmek için lütfen JavaScript'i etkinleştirin."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "Arama Sonuçları"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Aramanız hiçbir belgeyle eşleşmedi. Lütfen tüm kelimelerin doğru "
 "yazıldığından ve yeterli kategori seçtiğinizden emin olun."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Belgeleri arayın"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Sürümler"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "İndirmeler"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Read the Docs Üzerinde"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Proje Ana Sayfa"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Oluşturmalar"
--- a/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po
@ -1,149 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # 王赛 <wangsai@bootcss.com>, 2019
 # Anthony <aj@ohess.org>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2021-09-13 13:35-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Anthony <aj@ohess.org>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/readthedocs/teams/101354/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 #: sphinx_rtd_theme/breadcrumbs.html:37 sphinx_rtd_theme/breadcrumbs.html:39
 msgid "Edit on GitHub"
 msgstr "在 GitHub 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:44 sphinx_rtd_theme/breadcrumbs.html:46
 msgid "Edit on Bitbucket"
 msgstr "在 Bitbucket 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:51 sphinx_rtd_theme/breadcrumbs.html:53
 msgid "Edit on GitLab"
 msgstr "在 GitLab 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:56 sphinx_rtd_theme/breadcrumbs.html:58
 msgid "View page source"
 msgstr "查看页面源码"
 #: sphinx_rtd_theme/breadcrumbs.html:69 sphinx_rtd_theme/footer.html:6
 msgid "Previous"
 msgstr "上一页"
 #: sphinx_rtd_theme/breadcrumbs.html:72 sphinx_rtd_theme/footer.html:9
 msgid "Next"
 msgstr "下一页"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:30
 msgid "Build"
 msgstr "构建"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:36
 msgid "Revision"
 msgstr "修订"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "最后更新时间 %(last_updated)s。"
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:53
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "利用 %(sphinx_web)s 构建，使用了 "
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documentation
 #: sphinx_rtd_theme/footer.html:55
 msgid "theme"
 msgstr "主题"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:57
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "由 %(readthedocs_web)s开发"
 #: sphinx_rtd_theme/layout.html:97
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "在 %(docstitle)s中搜索"
 #: sphinx_rtd_theme/layout.html:105
 msgid "About these documents"
 msgstr "关于此文档"
 #: sphinx_rtd_theme/layout.html:108
 msgid "Index"
 msgstr "索引"
 #: sphinx_rtd_theme/layout.html:111 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "搜索"
 #: sphinx_rtd_theme/layout.html:114
 msgid "Copyright"
 msgstr "版权所有"
 #: sphinx_rtd_theme/layout.html:147 sphinx_rtd_theme/layout.html:149
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:31
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "请启用 JavaScript 以便使用搜索功能"
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:39
 msgid "Search Results"
 msgstr "搜索结果"
 #: sphinx_rtd_theme/search.html:41
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr "您的搜索没有匹配到任何文档。请确保所有单词拼写正确，并选择了足够多的类别。"
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "在文档中搜索"
 #: sphinx_rtd_theme/versions.html:3 sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "版本列表"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "下载链接"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "托管于 Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "项目首页"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "构建"
--- a/doc/_themes/sphinx_rtd_theme/search.html
+++ b/doc/_themes/sphinx_rtd_theme/search.html
@ -5,37 +5,31 @@
    Template for the search page.
    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see https://github.com/sphinx-doc/sphinx/blob/master/LICENSE for details.
+    :license: BSD, see LICENSE for details.
 #}
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
-{% set display_vcs_links = False %}
+{% set script_files = script_files + ['_static/searchtools.js'] %}
 {%- block scripts %}
    {{ super() }}
    <script src="{{ pathto('_static/searchtools.js', 1) }}"></script>
    <script src="{{ pathto('_static/language_data.js', 1) }}"></script>
 {%- endblock %}
 {% block footer %}
-  <script>
+  <script type="text/javascript">
    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
  </script>
  {# this is used when loading the search index using $.ajax fails,
     such as on Chrome for documents on localhost #}
-  <script id="searchindexloader"></script>
+  <script type="text/javascript" id="searchindexloader"></script>
  {{ super() }}
 {% endblock %}
 {% block body %}
  <noscript>
  <div id="fallback" class="admonition warning">
    <p class="last">
-      {% trans trimmed %}Please activate JavaScript to enable the search
+      {% trans %}Please activate JavaScript to enable the search
      functionality.{% endtrans %}
    </p>
  </div>
  </noscript>
  {% if search_performed %}
    {# Translators: Search is a noun, not a verb #}
    <h2>{{ _('Search Results') }}</h2>
    {% if not search_results %}
      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
--- a/doc/_themes/sphinx_rtd_theme/searchbox.html
+++ b/doc/_themes/sphinx_rtd_theme/searchbox.html
@ -1,7 +1,7 @@
-{%- if 'singlehtml' not in builder %}
+{%- if builder != 'singlehtml' %}
 <div role="search">
  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
+    <input type="text" name="q" placeholder="Search docs" />
    <input type="hidden" name="check_keywords" value="yes" />
    <input type="hidden" name="area" value="default" />
  </form>
--- a/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css
+++ b/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css
@ -1 +1,2 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
 /*# sourceMappingURL=badge_only.css.map */
--- a/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
+++ b/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
@ -0,0 +1,7 @@
 {
 "version": 3,
 "mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EAAE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,EEoC+B,MAAyB,EFnC7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EE+CyB,sDAAM,EF9C1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,EE+B6B,MAAK,EF9BvC,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,EEX6B,MAAM,EL4F1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EEgB2B,MAAyB,EFf3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EEI2B,GAAM,EFHxC,wDAAwB,EACtB,eAAgB,EEmBgB,MAAO,EFlBvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,EEP6B,GAAY,EFQ9C,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,EEfyB,MAAyB,EFgB7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
 "sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
 "names": [],
 "file": "badge_only.css"
 }
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/theme.css
+++ b/doc/_themes/sphinx_rtd_theme/static/css/theme.css
--- a/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
+++ b/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}	.fa:before{-webkit-font-smoothing:antialiased}.clearfix{zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
		`/# sourceMappingURL=badge_only.css.map /`