From b537af720ec22c0283923afcdbbc1df306907542 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:57 +0100 Subject: [PATCH 001/165] t0060: fix EBUSY in MinGW when setting up runtime prefix Two of our tests in t0060 verify that the runtime prefix functionality works as expected by creating a separate directory hierarchy, copying the Git executable in there and then creating scripts relative to that executable. These tests fail quite regularly in GitLab CI with the following error: expecting success of 0060.218 '%(prefix)/ works': mkdir -p pretend/bin && cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && git config yes.path "%(prefix)/yes" && GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual && echo "$(pwd)/pretend/yes" >expect && test_cmp expect actual ++ mkdir -p pretend/bin ++ cp /c/GitLab-Runner/builds/gitlab-org/git/git.exe pretend/bin/ cp: cannot create regular file 'pretend/bin/git.exe': Device or resource busy error: last command exited with $?=1 not ok 218 - %(prefix)/ works Seemingly, the "git.exe" binary we are trying to overwrite is still being held open. It is somewhat puzzling why exactly that is: while the preceding test _does_ write to and execute the same path, it should have exited and shouldn't keep any backgrounded processes around. So it must be held open by something else, either in MinGW or in Windows itself. While the root cause is puzzling, the workaround is trivial enough: instead of writing the file twice we simply pull the common setup into a separate test case so that we won't observe EBUSY in the first place. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- t/t0060-path-utils.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index dbb2e73bcd9..8545cdfab55 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -592,17 +592,19 @@ test_lazy_prereq CAN_EXEC_IN_PWD ' ./git rev-parse ' +test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'setup runtime prefix' ' + mkdir -p pretend/bin && + cp "$GIT_EXEC_PATH"/git$X pretend/bin/ +' + test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' ' - mkdir -p pretend/bin pretend/libexec/git-core && + mkdir -p pretend/libexec/git-core && echo "echo HERE" | write_script pretend/libexec/git-core/git-here && - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && GIT_EXEC_PATH= ./pretend/bin/git here >actual && echo HERE >expect && test_cmp expect actual' test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' ' - mkdir -p pretend/bin && - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && git config yes.path "%(prefix)/yes" && GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual && echo "$(pwd)/pretend/yes" >expect && -- GitLab From 65f586132bfa21c3e9fe7b2803ef526133a3b269 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:58 +0100 Subject: [PATCH 002/165] t7422: fix flaky test caused by buffered stdout One test in t7422 asserts that `git submodule status --recursive` properly handles SIGPIPE. This test is flaky though and may sometimes not see a SIGPIPE at all: expecting success of 7422.18 'git submodule status --recursive propagates SIGPIPE': { git submodule status --recursive 2>err; echo $?>status; } | grep -q X/S && test_must_be_empty err && test_match_signal 13 "$(cat status)" ++ git submodule status --recursive ++ grep -q X/S ++ echo 0 ++ test_must_be_empty err ++ test 1 -ne 1 ++ test_path_is_file err ++ test 1 -ne 1 ++ test -f err ++ test -s err +++ cat status ++ test_match_signal 13 0 ++ test 0 = 141 ++ test 0 = 269 ++ return 1 error: last command exited with $?=1 not ok 18 - git submodule status --recursive propagates SIGPIPE The issue is caused by a race between git-submodule(1) and grep(1): 1. git-submodule(1) (or its child process) writes the first X/S line we're trying to match. 2. grep(1) matches the line. 3a. grep(1) exits, closing the pipe. 3b. git-submodule(1) (or its child process) writes the rest of its lines. Steps 3a and 3b happen at the same time without any guarantees. If 3a happens first, we get SIGPIPE. Otherwise, we don't and the test fails. Fix the issue by generating a couple thousand nested submodules and matching on the first nested submodule. This ensures that the recursive git-submodule(1) process completely fills its stdout buffer, which makes subsequent writes block until the downstream consumer of the pipe either reads more or closes it. To verify that this works as expected one can apply the following patch to the preimage of this commit, which used to reliably trigger the race: diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index 3c5177cc30..df6001f8a0 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -202,7 +202,7 @@ test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' cd repo && GIT_ALLOW_PROTOCOL=file git submodule add "$(pwd)"/../submodule && { git submodule status --recursive 2>err; echo $?>status; } | - grep -q recursive-submodule-path-1 && + { sleep 1 && grep -q recursive-submodule-path-1 && sleep 1; } && test_must_be_empty err && test_match_signal 13 "$(cat status)" ) With the pipe-stuffing workaround the test runs successfully. Helped-by: Jeff King Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- t/t7422-submodule-output.sh | 43 +++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index f21e9203678..023a5cbdc44 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -167,10 +167,45 @@ do done test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' ' - { git submodule status --recursive 2>err; echo $?>status; } | - grep -q X/S && - test_must_be_empty err && - test_match_signal 13 "$(cat status)" + # The test setup is somewhat involved because triggering a SIGPIPE is + # racy with buffered pipes. To avoid the raciness we thus need to make + # sure that the subprocess in question fills the buffers completely, + # which requires a couple thousand submodules in total. + test_when_finished "rm -rf submodule repo" && + git init submodule && + ( + cd submodule && + test_commit initial && + + COMMIT=$(git rev-parse HEAD) && + for i in $(test_seq 2000) + do + printf "[submodule \"sm-$i\"]\npath = recursive-submodule-path-$i\n" "$i" || + return 1 + done >gitmodules && + BLOB=$(git hash-object -w --stdin tree && + for i in $(test_seq 2000) + do + printf "160000 commit $COMMIT\trecursive-submodule-path-%d\n" "$i" || + return 1 + done >>tree && + TREE=$(git mktree err; echo $?>status; } | + grep -q recursive-submodule-path-1 && + test_must_be_empty err && + test_match_signal 13 "$(cat status)" + ) ' test_done -- GitLab From 2a21098b98ae2f9581a91e2e474c397e5cbede12 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:59 +0100 Subject: [PATCH 003/165] github: adapt containerized jobs to be rootless The containerized jobs in GitHub Actions run as root, giving them special permissions to for example delete files even when the user shouldn't be able to due to file permissions. This limitation keeps us from using containerized jobs for most of our Ubuntu-based jobs as it causes a number of tests to fail. Adapt the jobs to create a separate user that executes the test suite. This follows similar infrastructure that we already have in GitLab CI. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 6 ++++-- ci/install-dependencies.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 900be9957a2..b02f5873a54 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -371,10 +371,12 @@ jobs: run: apt -q update && apt -q -y install libc6-amd64 lib64stdc++6 - uses: actions/checkout@v4 - run: ci/install-dependencies.sh - - run: ci/run-build-and-tests.sh + - run: useradd builder --create-home + - run: chown -R builder . + - run: sudo --preserve-env --set-home --user=builder ci/run-build-and-tests.sh - name: print test failures if: failure() && env.FAILED_TEST_ARTIFACTS != '' - run: ci/print-test-failures.sh + run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' uses: actions/upload-artifact@v4 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d1cb9fa8785..ecb5b9d36c2 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -31,7 +31,7 @@ alpine-*) ;; fedora-*|almalinux-*) dnf -yq update >/dev/null && - dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null + dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null ;; ubuntu-*|ubuntu32-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. -- GitLab From 9548e0478edaad0ec1e5dc4b7afc7af51dee43b0 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:00 +0100 Subject: [PATCH 004/165] github: convert all Linux jobs to be containerized We have split the CI jobs in GitHub Workflows into two categories: - Those running on a machine pool directly. - Those running in a container on the machine pool. The latter is more flexible because it allows us to freely pick whatever container image we want to use for a specific job, while the former only allows us to pick from a handful of different distros. The containerized jobs do not have any significant downsides to the best of my knowledge: - They aren't significantly slower to start up. A quick comparison by Peff shows that the difference is mostly lost in the noise: job | old | new --------------------|------|------ linux-TEST-vars 11m30s 10m54s linux-asan-ubsan 30m26s 31m14s linux-gcc 9m47s 10m6s linux-gcc-default 9m47s 9m41s linux-leaks 25m50s 25m21s linux-meson 10m36s 10m41s linux-reftable 10m25s 10m23s linux-reftable-leaks 27m18s 27m28s linux-sha256 9m54s 10m31s Some jobs are a bit faster, some are a bit slower, but there does not seem to be any significant change. - Containerized jobs run as root, which keeps a couple of tests from running. This has been addressed in the preceding commit though, where we now use setpriv(1) to run tests as a separate user. - GitHub injects a Node binary into containerized jobs, which is dynamically linked. This has led to some issues in the past [1], but only for our 32 bit jobs. The issues have since been resolved. Overall there seem to be no downsides, but the upside is that we have more control over the exact image that these jobs use. Convert the Linux jobs accordingly. [1]: https://lore.kernel.org/git/20240912094841.GD589828@coredump.intra.peff.net/ Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 68 ++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b02f5873a54..8e5847da4fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -259,20 +259,6 @@ jobs: fail-fast: false matrix: vector: - - jobname: linux-sha256 - cc: clang - pool: ubuntu-latest - - jobname: linux-reftable - cc: clang - pool: ubuntu-latest - - jobname: linux-gcc - cc: gcc - cc_package: gcc-8 - pool: ubuntu-20.04 - - jobname: linux-TEST-vars - cc: gcc - cc_package: gcc-8 - pool: ubuntu-20.04 - jobname: osx-clang cc: clang pool: macos-13 @@ -285,21 +271,6 @@ jobs: - jobname: osx-meson cc: clang pool: macos-13 - - jobname: linux-gcc-default - cc: gcc - pool: ubuntu-latest - - jobname: linux-leaks - cc: gcc - pool: ubuntu-latest - - jobname: linux-reftable-leaks - cc: gcc - pool: ubuntu-latest - - jobname: linux-asan-ubsan - cc: clang - pool: ubuntu-latest - - jobname: linux-meson - cc: gcc - pool: ubuntu-latest env: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} @@ -342,6 +313,44 @@ jobs: fail-fast: false matrix: vector: + - jobname: linux-sha256 + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-reftable + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-gcc + image: ubuntu:20.04 + cc: gcc + cc_package: gcc-8 + distro: ubuntu-20.04 + - jobname: linux-TEST-vars + image: ubuntu:20.04 + cc: gcc + cc_package: gcc-8 + distro: ubuntu-20.04 + - jobname: linux-gcc-default + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-leaks + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-reftable-leaks + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-asan-ubsan + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-meson + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest - jobname: linux-musl image: alpine distro: alpine-latest @@ -363,6 +372,7 @@ jobs: env: jobname: ${{matrix.vector.jobname}} distro: ${{matrix.vector.distro}} + CC: ${{matrix.vector.cc}} runs-on: ubuntu-latest container: ${{matrix.vector.image}} steps: -- GitLab From b133d3071ae6c648aced1c40e12914cb6b2ccec9 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:01 +0100 Subject: [PATCH 005/165] github: simplify computation of the job's distro We explicitly list the distro of Linux-based jobs, but it is equivalent to the name of the image in almost all cases, except that colons are replaced with dashes. Drop the redundant information and massage it in our CI scripts, which is equivalent to how we do it in GitLab CI. There are a couple of exceptions: - The "linux32" job, whose distro name is different than the image name. This is handled by adapting all sites to use the new name. - The "alpine" and "fedora" jobs, neither of which specify a tag for their image. This is handled by adding the "latest" tag. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 22 ++++------------------ ci/install-dependencies.sh | 4 ++-- ci/lib.sh | 2 ++ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e5847da4fa..b54da639a65 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -275,7 +275,7 @@ jobs: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} jobname: ${{matrix.vector.jobname}} - distro: ${{matrix.vector.pool}} + CI_JOB_IMAGE: ${{matrix.vector.pool}} TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t runs-on: ${{matrix.vector.pool}} steps: @@ -316,63 +316,49 @@ jobs: - jobname: linux-sha256 image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-reftable image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-gcc image: ubuntu:20.04 cc: gcc cc_package: gcc-8 - distro: ubuntu-20.04 - jobname: linux-TEST-vars image: ubuntu:20.04 cc: gcc cc_package: gcc-8 - distro: ubuntu-20.04 - jobname: linux-gcc-default image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-leaks image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-reftable-leaks image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-asan-ubsan image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-meson image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-musl - image: alpine - distro: alpine-latest + image: alpine:latest # Supported until 2025-04-02. - jobname: linux32 image: i386/ubuntu:focal - distro: ubuntu32-20.04 - jobname: pedantic - image: fedora - distro: fedora-latest + image: fedora:latest # A RHEL 8 compatible distro. Supported until 2029-05-31. - jobname: almalinux-8 image: almalinux:8 - distro: almalinux-8 # Supported until 2026-08-31. - jobname: debian-11 image: debian:11 - distro: debian-11 env: jobname: ${{matrix.vector.jobname}} - distro: ${{matrix.vector.distro}} CC: ${{matrix.vector.cc}} + CI_JOB_IMAGE: ${{matrix.vector.image}} runs-on: ubuntu-latest container: ${{matrix.vector.image}} steps: diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index ecb5b9d36c2..d5a959e25ff 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -33,7 +33,7 @@ fedora-*|almalinux-*) dnf -yq update >/dev/null && dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null ;; -ubuntu-*|ubuntu32-*|debian-*) +ubuntu-*|i386/ubuntu-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. export DEBIAN_FRONTEND=noninteractive @@ -42,7 +42,7 @@ ubuntu-*|ubuntu32-*|debian-*) SVN='libsvn-perl subversion' LANGUAGES='language-pack-is' ;; - ubuntu32-*) + i386/ubuntu-*) SVN= LANGUAGES='language-pack-is' ;; diff --git a/ci/lib.sh b/ci/lib.sh index 8885ee3c3f8..f8b68ab8a65 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -246,6 +246,8 @@ then GIT_TEST_OPTS="--github-workflow-markup" JOBS=10 + + distro=$(echo "$CI_JOB_IMAGE" | tr : -) elif test true = "$GITLAB_CI" then CI_TYPE=gitlab-ci -- GitLab From 5aea4ff36c58bd3c6d6c0852e6b3469261348e0d Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:02 +0100 Subject: [PATCH 006/165] gitlab-ci: remove the "linux-old" job The "linux-old" job was historically testing against the oldest supported LTS release of Ubuntu. But with c85bcb5de1 (gitlab-ci: switch from Ubuntu 16.04 to 20.04, 2024-10-31) it has been converted to test against Ubuntu 20.04, which already gets exercised in a couple of other CI jobs. It's thus not adding any significant test coverage. Drop the job. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9254e015833..00bc7278650 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,9 +36,6 @@ test:linux: fi parallel: matrix: - - jobname: linux-old - image: ubuntu:20.04 - CC: gcc - jobname: linux-sha256 image: ubuntu:latest CC: clang -- GitLab From 4ad71b16cdc8f5f367931b908fa904e8e8c48b47 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:03 +0100 Subject: [PATCH 007/165] gitlab-ci: add linux32 job testing against i386 Add another job to GitLab CI that tests against the i386 architecture. This job is equivalent to the same job in GitHub Workflows. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .gitlab-ci.yml | 2 ++ ci/lib.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bc7278650..29e9056dd50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,8 @@ test:linux: image: fedora:latest - jobname: linux-musl image: alpine:latest + - jobname: linux32 + image: i386/ubuntu:20.04 - jobname: linux-meson image: ubuntu:latest CC: gcc diff --git a/ci/lib.sh b/ci/lib.sh index f8b68ab8a65..2293849ada3 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -269,7 +269,7 @@ then CI_OS_NAME=osx JOBS=$(nproc) ;; - *,alpine:*|*,fedora:*|*,ubuntu:*) + *,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*) CI_OS_NAME=linux JOBS=$(nproc) ;; -- GitLab From 678b22f528d533ab49944a696639e664d301a7e7 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:04 +0100 Subject: [PATCH 008/165] ci: stop special-casing for Ubuntu 16.04 With c85bcb5de1 (gitlab-ci: switch from Ubuntu 16.04 to 20.04, 2024-10-31) we have adapted the last CI job to stop using Ubuntu 16.04 in favor of Ubuntu 20.04. Remove the special-casing we still have in our CI scripts. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- ci/lib.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 2293849ada3..77a4aabdb8f 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -347,14 +347,7 @@ ubuntu-*) fi MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" - case "$distro" in - ubuntu-16.04) - # Apache is too old for HTTP/2. - ;; - *) - export GIT_TEST_HTTPD=true - ;; - esac + export GIT_TEST_HTTPD=true # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever -- GitLab From 6bc06e8f20a8cd67d6e49d31472d5bc8c048cae0 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:05 +0100 Subject: [PATCH 009/165] ci: use latest Ubuntu release Both GitHub Actions and GitLab CI use the "ubuntu:latest" tag as the default image for most jobs. This tag is somewhat misleading though, as it does not refer to the latest release of Ubuntu, but to the latest LTS release thereof. But as we already have a couple of jobs exercising the oldest LTS release of Ubuntu that Git still supports, it would make more sense to test the oldest and youngest versions of Ubuntu. Adapt these jobs to instead use the "ubuntu:rolling" tag, which refers to the actual latest release, which currently is Ubuntu 24.10. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 14 +++++++------- .gitlab-ci.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b54da639a65..b90381ae015 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -314,10 +314,10 @@ jobs: matrix: vector: - jobname: linux-sha256 - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-reftable - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-gcc image: ubuntu:20.04 @@ -328,19 +328,19 @@ jobs: cc: gcc cc_package: gcc-8 - jobname: linux-gcc-default - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-leaks - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-reftable-leaks - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-asan-ubsan - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-meson - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-musl image: alpine:latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29e9056dd50..8ed3ff5f037 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,10 +37,10 @@ test:linux: parallel: matrix: - jobname: linux-sha256 - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: linux-reftable - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: linux-gcc image: ubuntu:20.04 @@ -51,16 +51,16 @@ test:linux: CC: gcc CC_PACKAGE: gcc-8 - jobname: linux-gcc-default - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-leaks - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-reftable-leaks - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-asan-ubsan - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: pedantic image: fedora:latest @@ -69,7 +69,7 @@ test:linux: - jobname: linux32 image: i386/ubuntu:20.04 - jobname: linux-meson - image: ubuntu:latest + image: ubuntu:rolling CC: gcc artifacts: paths: -- GitLab From e39e332e5043d7e8f48fbfc91c3bd6d45a52cb7b Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:06 +0100 Subject: [PATCH 010/165] ci: remove stale code for Azure Pipelines Support for Azure Pipelines has been retired in 6081d3898f (ci: retire the Azure Pipelines definition, 2020-04-11) in favor of GitHub Actions. Our CI library still has some infrastructure left for Azure though that is now unused. Remove it. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- ci/lib.sh | 21 +-------------------- ci/print-test-failures.sh | 5 ----- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 77a4aabdb8f..4003354f16c 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -206,26 +206,7 @@ export TERM=${TERM:-dumb} # Clear MAKEFLAGS that may come from the outside world. export MAKEFLAGS= -if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" -then - CI_TYPE=azure-pipelines - # We are running in Azure Pipelines - CI_BRANCH="$BUILD_SOURCEBRANCH" - CI_COMMIT="$BUILD_SOURCEVERSION" - CI_JOB_ID="$BUILD_BUILDID" - CI_JOB_NUMBER="$BUILD_BUILDNUMBER" - CI_OS_NAME="$(echo "$AGENT_OS" | tr A-Z a-z)" - test darwin != "$CI_OS_NAME" || CI_OS_NAME=osx - CI_REPO_SLUG="$(expr "$BUILD_REPOSITORY_URI" : '.*/\([^/]*/[^/]*\)$')" - CC="${CC:-gcc}" - - # use a subdirectory of the cache dir (because the file share is shared - # among *all* phases) - cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME" - - GIT_TEST_OPTS="--write-junit-xml" - JOBS=10 -elif test true = "$GITHUB_ACTIONS" +if test true = "$GITHUB_ACTIONS" then CI_TYPE=github-actions CI_BRANCH="$GITHUB_REF" diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index 655687dd827..dc910e51609 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -39,11 +39,6 @@ do test_name="${test_name##*/}" trash_dir="trash directory.$test_name" case "$CI_TYPE" in - azure-pipelines) - mkdir -p failed-test-artifacts - mv "$trash_dir" failed-test-artifacts - continue - ;; github-actions) mkdir -p failed-test-artifacts echo "FAILED_TEST_ARTIFACTS=${TEST_OUTPUT_DIRECTORY:t}/failed-test-artifacts" >>$GITHUB_ENV -- GitLab From 4cbe9e0e21fca682d78980a03184071e9fe1c955 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 19 Jan 2023 13:40:31 +0100 Subject: [PATCH 011/165] gitk(Windows): avoid inadvertently calling executables in the worktree Just like CVE-2022-41953 for Git GUI, there exists a vulnerability of `gitk` where it looks for `taskkill.exe` in the current directory before searching `PATH`. Note that the many `exec git` calls are unaffected, due to an obscure quirk in Tcl's `exec` function. Typically, `git.exe` lives next to `wish.exe` (i.e. the program that is run to execute `gitk` or Git GUI) in Git for Windows, and that is the saving grace for `git.exe because `exec` searches the directory where `wish.exe` lives even before the current directory, according to https://www.tcl-lang.org/man/tcl/TclCmd/exec.htm#M24: If a directory name was not specified as part of the application name, the following directories are automatically searched in order when attempting to locate the application: The directory from which the Tcl executable was loaded. The current directory. The Windows 32-bit system directory. The Windows home directory. The directories listed in the path. The same is not true, however, for `taskkill.exe`: it lives in the Windows system directory (never mind the 32-bit, Tcl's documentation is outdated on that point, it really means `C:\Windows\system32`). Signed-off-by: Johannes Schindelin --- gitk | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/gitk b/gitk index 47a7c1d29c4..5c8790dccd2 100755 --- a/gitk +++ b/gitk @@ -9,6 +9,141 @@ exec wish "$0" -- "$@" package require Tk +###################################################################### +## +## Enabling platform-specific code paths + +proc is_MacOSX {} { + if {[tk windowingsystem] eq {aqua}} { + return 1 + } + return 0 +} + +proc is_Windows {} { + if {$::tcl_platform(platform) eq {windows}} { + return 1 + } + return 0 +} + +set _iscygwin {} +proc is_Cygwin {} { + global _iscygwin + if {$_iscygwin eq {}} { + if {[string match "CYGWIN_*" $::tcl_platform(os)]} { + set _iscygwin 1 + } else { + set _iscygwin 0 + } + } + return $_iscygwin +} + +###################################################################### +## +## PATH lookup + +set _search_path {} +proc _which {what args} { + global env _search_exe _search_path + + if {$_search_path eq {}} { + if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} { + set _search_path [split [exec cygpath \ + --windows \ + --path \ + --absolute \ + $env(PATH)] {;}] + set _search_exe .exe + } elseif {[is_Windows]} { + set gitguidir [file dirname [info script]] + regsub -all ";" $gitguidir "\\;" gitguidir + set env(PATH) "$gitguidir;$env(PATH)" + set _search_path [split $env(PATH) {;}] + # Skip empty `PATH` elements + set _search_path [lsearch -all -inline -not -exact \ + $_search_path ""] + set _search_exe .exe + } else { + set _search_path [split $env(PATH) :] + set _search_exe {} + } + } + + if {[is_Windows] && [lsearch -exact $args -script] >= 0} { + set suffix {} + } else { + set suffix $_search_exe + } + + foreach p $_search_path { + set p [file join $p $what$suffix] + if {[file exists $p]} { + return [file normalize $p] + } + } + return {} +} + +proc sanitize_command_line {command_line from_index} { + set i $from_index + while {$i < [llength $command_line]} { + set cmd [lindex $command_line $i] + if {[file pathtype $cmd] ne "absolute"} { + set fullpath [_which $cmd] + if {$fullpath eq ""} { + throw {NOT-FOUND} "$cmd not found in PATH" + } + lset command_line $i $fullpath + } + + # handle piped commands, e.g. `exec A | B` + for {incr i} {$i < [llength $command_line]} {incr i} { + if {[lindex $command_line $i] eq "|"} { + incr i + break + } + } + } + return $command_line +} + +# Override `exec` to avoid unsafe PATH lookup + +rename exec real_exec + +proc exec {args} { + # skip options + for {set i 0} {$i < [llength $args]} {incr i} { + set arg [lindex $args $i] + if {$arg eq "--"} { + incr i + break + } + if {[string range $arg 0 0] ne "-"} { + break + } + } + set args [sanitize_command_line $args $i] + uplevel 1 real_exec $args +} + +# Override `open` to avoid unsafe PATH lookup + +rename open real_open + +proc open {args} { + set arg0 [lindex $args 0] + if {[string range $arg0 0 0] eq "|"} { + set command_line [string trim [string range $arg0 1 end]] + lset args 0 "| [sanitize_command_line $command_line 0]" + } + uplevel 1 real_open $args +} + +# End of safe PATH lookup stuff + proc hasworktree {} { return [expr {[exec git rev-parse --is-bare-repository] == "false" && [exec git rev-parse --is-inside-git-dir] == "false"}] -- GitLab From 5eb02dd8f08fc3b7ff22320c3311cd1da6a5ab4d Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Sat, 4 Feb 2012 21:54:36 +0100 Subject: [PATCH 012/165] gitk: Unicode file name support Assumes file names in git tree objects are UTF-8 encoded. On most unix systems, the system encoding (and thus the TCL system encoding) will be UTF-8, so file names will be displayed correctly. On Windows, it is impossible to set the system encoding to UTF-8. Changing the TCL system encoding (via 'encoding system ...', e.g. in the startup code) is explicitly discouraged by the TCL docs. Change gitk functions dealing with file names to always convert from and to UTF-8. Signed-off-by: Karsten Blees Signed-off-by: Johannes Schindelin --- gitk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gitk b/gitk index 5c8790dccd2..ae694bfdc61 100755 --- a/gitk +++ b/gitk @@ -7855,7 +7855,7 @@ proc gettreeline {gtf id} { if {[string index $fname 0] eq "\""} { set fname [lindex $fname 0] } - set fname [encoding convertfrom $fname] + set fname [encoding convertfrom utf-8 $fname] lappend treefilelist($id) $fname } if {![eof $gtf]} { @@ -8117,7 +8117,7 @@ proc gettreediffline {gdtf ids} { if {[string index $file 0] eq "\""} { set file [lindex $file 0] } - set file [encoding convertfrom $file] + set file [encoding convertfrom utf-8 $file] if {$file ne [lindex $treediff end]} { lappend treediff $file lappend sublist $file @@ -8262,7 +8262,7 @@ proc makediffhdr {fname ids} { global ctext curdiffstart treediffs diffencoding global ctext_file_names jump_to_here targetline diffline - set fname [encoding convertfrom $fname] + set fname [encoding convertfrom utf-8 $fname] set diffencoding [get_path_encoding $fname] set i [lsearch -exact $treediffs($ids) $fname] if {$i >= 0} { @@ -8324,7 +8324,7 @@ proc parseblobdiffline {ids line} { if {![string compare -length 5 "diff " $line]} { if {![regexp {^diff (--cc|--git) } $line m type]} { - set line [encoding convertfrom $line] + set line [encoding convertfrom utf-8 $line] $ctext insert end "$line\n" hunksep continue } @@ -8373,7 +8373,7 @@ proc parseblobdiffline {ids line} { makediffhdr $fname $ids } elseif {![string compare -length 16 "* Unmerged path " $line]} { - set fname [encoding convertfrom [string range $line 16 end]] + set fname [encoding convertfrom utf-8 [string range $line 16 end]] $ctext insert end "\n" set curdiffstart [$ctext index "end - 1c"] lappend ctext_file_names $fname @@ -8426,7 +8426,7 @@ proc parseblobdiffline {ids line} { if {[string index $fname 0] eq "\""} { set fname [lindex $fname 0] } - set fname [encoding convertfrom $fname] + set fname [encoding convertfrom utf-8 $fname] set i [lsearch -exact $treediffs($ids) $fname] if {$i >= 0} { setinlist difffilestart $i $curdiffstart @@ -8445,6 +8445,7 @@ proc parseblobdiffline {ids line} { set diffinhdr 0 return } + set line [encoding convertfrom utf-8 $line] $ctext insert end "$line\n" filesep } else { @@ -12440,7 +12441,7 @@ proc cache_gitattr {attr pathlist} { foreach row [split $rlist "\n"] { if {[regexp "(.*): $attr: (.*)" $row m path value]} { if {[string index $path 0] eq "\""} { - set path [encoding convertfrom [lindex $path 0]] + set path [encoding convertfrom utf-8 [lindex $path 0]] } set path_attr_cache($attr,$path) $value } -- GitLab From baaa9d6d8688ac1787e4be6087173c9e4341b162 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Sun, 22 Jul 2012 23:19:24 +0200 Subject: [PATCH 013/165] gitk: Use an external icon file on Windows Git for Windows now ships with the new Git icon from git-scm.com. Use that icon file if it exists instead of the old procedurally drawn one. This patch was sent upstream but so far no decision on its inclusion was made, so commit it to our fork. Signed-off-by: Sebastian Schuberth Signed-off-by: Johannes Schindelin --- gitk | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/gitk b/gitk index ae694bfdc61..96b87df5d0d 100755 --- a/gitk +++ b/gitk @@ -12471,7 +12471,6 @@ if { [info exists ::env(GITK_MSGSDIR)] } { set gitk_prefix [file dirname [file dirname [file normalize $argv0]]] set gitk_libdir [file join $gitk_prefix share gitk lib] set gitk_msgsdir [file join $gitk_libdir msgs] - unset gitk_prefix } ## Internationalization (i18n) through msgcat and gettext. See @@ -12837,28 +12836,32 @@ if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} { set worktree [gitworktree] setcoords makewindow -catch { - image create photo gitlogo -width 16 -height 16 - - image create photo gitlogominus -width 4 -height 2 - gitlogominus put #C00000 -to 0 0 4 2 - gitlogo copy gitlogominus -to 1 5 - gitlogo copy gitlogominus -to 6 5 - gitlogo copy gitlogominus -to 11 5 - image delete gitlogominus - - image create photo gitlogoplus -width 4 -height 4 - gitlogoplus put #008000 -to 1 0 3 4 - gitlogoplus put #008000 -to 0 1 4 3 - gitlogo copy gitlogoplus -to 1 9 - gitlogo copy gitlogoplus -to 6 9 - gitlogo copy gitlogoplus -to 11 9 - image delete gitlogoplus - - image create photo gitlogo32 -width 32 -height 32 - gitlogo32 copy gitlogo -zoom 2 2 - - wm iconphoto . -default gitlogo gitlogo32 +if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.ico]} { + wm iconbitmap . -default $gitk_prefix/etc/git.ico +} else { + catch { + image create photo gitlogo -width 16 -height 16 + + image create photo gitlogominus -width 4 -height 2 + gitlogominus put #C00000 -to 0 0 4 2 + gitlogo copy gitlogominus -to 1 5 + gitlogo copy gitlogominus -to 6 5 + gitlogo copy gitlogominus -to 11 5 + image delete gitlogominus + + image create photo gitlogoplus -width 4 -height 4 + gitlogoplus put #008000 -to 1 0 3 4 + gitlogoplus put #008000 -to 0 1 4 3 + gitlogo copy gitlogoplus -to 1 9 + gitlogo copy gitlogoplus -to 6 9 + gitlogo copy gitlogoplus -to 11 9 + image delete gitlogoplus + + image create photo gitlogo32 -width 32 -height 32 + gitlogo32 copy gitlogo -zoom 2 2 + + wm iconphoto . -default gitlogo gitlogo32 + } } # wait for the window to become visible if {![winfo viewable .]} {tkwait visibility .} -- GitLab From ac75b4c265952e382dbd67018058a853393d4ecd Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 16 Feb 2016 16:42:06 +0100 Subject: [PATCH 014/165] gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6 Tcl/Tk 8.6 introduced new events for the cursor left/right keys and apparently changed the behavior of the previous event. Let's work around that by using the new events when we are running with Tcl/Tk 8.6 or later. This fixes https://github.com/git-for-windows/git/issues/495 Signed-off-by: Johannes Schindelin --- gitk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gitk b/gitk index 96b87df5d0d..5b9b1f64fdf 100755 --- a/gitk +++ b/gitk @@ -2238,7 +2238,7 @@ proc makewindow {} { global headctxmenu progresscanv progressitem progresscoords statusw global fprogitem fprogcoord lastprogupdate progupdatepending global rprogitem rprogcoord rownumsel numcommits - global have_tk85 use_ttk NS + global have_tk85 have_tk86 use_ttk NS global git_version global worddiff @@ -2736,8 +2736,13 @@ proc makewindow {} { bind . "selnextline 1" bind . "dofind -1 0" bind . "dofind 1 0" - bindkey "goforw" - bindkey "goback" + if {$have_tk86} { + bindkey <> "goforw" + bindkey <> "goback" + } else { + bindkey "goforw" + bindkey "goback" + } bind . "selnextpage -1" bind . "selnextpage 1" bind . <$M1B-Home> "allcanvs yview moveto 0.0" @@ -12772,6 +12777,7 @@ set nullid2 "0000000000000000000000000000000000000001" set nullfile "/dev/null" set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] +set have_tk86 [expr {[package vcompare $tk_version "8.6"] >= 0}] if {![info exists have_ttk]} { set have_ttk [llength [info commands ::ttk::style]] } -- GitLab From 18a7e19846ee186d60dbf7c2c865ac1d1aa531c4 Mon Sep 17 00:00:00 2001 From: "James J. Raden" Date: Thu, 21 Jan 2016 12:07:47 -0500 Subject: [PATCH 015/165] gitk: make the "list references" default window width wider When using remotes (with git-flow especially), the remote reference names are almost always wordwrapped in the "list references" window because it's somewhat narrow by default. It's possible to resize it with a mouse, but it's annoying to have to do this every time, especially on Windows 10, where the window border seems to be only one (1) pixel wide, thus making the grabbing of the window border tricky. Signed-off-by: James J. Raden Signed-off-by: Johannes Schindelin --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 5b9b1f64fdf..bc9efa18566 100755 --- a/gitk +++ b/gitk @@ -10209,7 +10209,7 @@ proc showrefs {} { text $top.list -background $bgcolor -foreground $fgcolor \ -selectbackground $selectbgcolor -font mainfont \ -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \ - -width 30 -height 20 -cursor $maincursor \ + -width 60 -height 20 -cursor $maincursor \ -spacing1 1 -spacing3 1 -state disabled $top.list tag configure highlight -background $selectbgcolor if {![lsearch -exact $bglist $top.list]} { -- GitLab From 4e3dd47c9d5f9dcae0a0d6c59c6676213914ac0e Mon Sep 17 00:00:00 2001 From: Scott Chacon Date: Mon, 13 Jan 2025 09:33:44 +0000 Subject: [PATCH 016/165] help: interpret boolean string values for help.autocorrect A help.autocorrect value of 1 is currently interpreted as "wait 1 decisecond", which can be confusing to users who believe they are setting a boolean value to turn the autocorrect feature on. Interpret the value of help.autocorrect as either one of the accepted list of special values ("never", "immediate", ...), a boolean or an integer. If the value is 1, it is no longer interpreted as a decisecond value of 0.1s but as a true boolean, the equivalent of "immediate". If the value is 2 or more, continue treating it as a decisecond wait time. False boolean string values ("off", "false", "no") are now equivalent to "never", meaning that guessed values are still shown but nothing is executed. True boolean string values are interpreted as "immediate". Signed-off-by: Scott Chacon Signed-off-by: Junio C Hamano --- Documentation/config/help.txt | 9 ++++---- help.c | 42 +++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt index 610701f9a37..a4c6079af81 100644 --- a/Documentation/config/help.txt +++ b/Documentation/config/help.txt @@ -11,13 +11,14 @@ help.autoCorrect:: If git detects typos and can identify exactly one valid command similar to the error, git will try to suggest the correct command or even run the suggestion automatically. Possible config values are: - - 0 (default): show the suggested command. - - positive number: run the suggested command after specified + - 0: show the suggested command (default). + - 1, "true", "on", "yes", "immediate": run the suggested command +immediately. + - positive number > 1: run the suggested command after specified deciseconds (0.1 sec). - - "immediate": run the suggested command immediately. + - "false", "off", "no", "never": don't run or show any suggested command. - "prompt": show the suggestion and prompt for confirmation to run the command. - - "never": don't run or show any suggested command. help.htmlPath:: Specify the path where the HTML documentation resides. File system paths diff --git a/help.c b/help.c index 5483ea8fd29..7148963e468 100644 --- a/help.c +++ b/help.c @@ -556,6 +556,27 @@ struct help_unknown_cmd_config { #define AUTOCORRECT_NEVER (-2) #define AUTOCORRECT_IMMEDIATELY (-1) +static int parse_autocorrect(const char *value) +{ + switch (git_parse_maybe_bool_text(value)) { + case 1: + return AUTOCORRECT_IMMEDIATELY; + case 0: + return AUTOCORRECT_NEVER; + default: /* other random text */ + break; + } + + if (!strcmp(value, "prompt")) + return AUTOCORRECT_PROMPT; + if (!strcmp(value, "never")) + return AUTOCORRECT_NEVER; + if (!strcmp(value, "immediate")) + return AUTOCORRECT_IMMEDIATELY; + + return 0; +} + static int git_unknown_cmd_config(const char *var, const char *value, const struct config_context *ctx, void *cb) @@ -564,20 +585,17 @@ static int git_unknown_cmd_config(const char *var, const char *value, const char *p; if (!strcmp(var, "help.autocorrect")) { - if (!value) - return config_error_nonbool(var); - if (!strcmp(value, "never")) { - cfg->autocorrect = AUTOCORRECT_NEVER; - } else if (!strcmp(value, "immediate")) { - cfg->autocorrect = AUTOCORRECT_IMMEDIATELY; - } else if (!strcmp(value, "prompt")) { - cfg->autocorrect = AUTOCORRECT_PROMPT; - } else { - int v = git_config_int(var, value, ctx->kvi); - cfg->autocorrect = (v < 0) - ? AUTOCORRECT_IMMEDIATELY : v; + int v = parse_autocorrect(value); + + if (!v) { + v = git_config_int(var, value, ctx->kvi); + if (v < 0 || v == 1) + v = AUTOCORRECT_IMMEDIATELY; } + + cfg->autocorrect = v; } + /* Also use aliases for command lookup */ if (skip_prefix(var, "alias.", &p)) add_cmdname(&cfg->aliases, p, strlen(p)); -- GitLab From 89cdbffa8619b0f5e87bacf12dfa400259511b1e Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 20 Jan 2025 01:55:59 +0000 Subject: [PATCH 017/165] doc: update gitignore for .adoc extension We presently use the ".txt" extension for our AsciiDoc files. While not wrong, most editors do not associate this extension with AsciiDoc, meaning that contributors don't get automatic editor functionality that could be useful, such as syntax highlighting and prose linting. Instead, in a future commit, we're going to move to using the more common ".adoc" extension for these files, which many editors intrinsically recognize as an AsciiDoc file. To avoid contributors accidentally checking in generated files, ignore the new extension for generated files in the documentation .gitignore files. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- Documentation/.gitignore | 4 ++++ Documentation/technical/.gitignore | 1 + 2 files changed, 5 insertions(+) diff --git a/Documentation/.gitignore b/Documentation/.gitignore index 9f4bb3c4bf9..abce806398f 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -7,10 +7,14 @@ git.info gitman.info howto-index.txt +howto-index.adoc doc.dep cmds-*.txt +cmds-*.adoc mergetools-*.txt +mergetools-*.adoc SubmittingPatches.txt +SubmittingPatches.adoc tmp-doc-diff/ tmp-meson-diff/ GIT-ASCIIDOCFLAGS diff --git a/Documentation/technical/.gitignore b/Documentation/technical/.gitignore index 8aa891daee0..3caef14a938 100644 --- a/Documentation/technical/.gitignore +++ b/Documentation/technical/.gitignore @@ -1 +1,2 @@ api-index.txt +api-index.adoc -- GitLab From 97343c8c2f6e63fd0889b422ab65126448e68619 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 20 Jan 2025 01:56:00 +0000 Subject: [PATCH 018/165] editorconfig: add .adoc extension The .adoc extension is commonly used for AsciiDoc files. In a future commit, we'll update some files to switch from the .txt extension to the .adoc extension, so update the EditorConfig file to use the same configuration for both extensions, since we want the files to be formatted completely identically whether they're using the older or newer extension. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 15d6cbeab10..a3c578a43ce 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ insert_final_newline = true # The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep # them in sync. -[{*.{c,h,sh,perl,pl,pm,txt},config.mak.*,Makefile}] +[{*.{c,h,sh,perl,pl,pm,txt,adoc},config.mak.*,Makefile}] indent_style = tab tab_width = 8 -- GitLab From ed4cf6e8e29bebb9324ba1a400a6c07513f2d642 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 20 Jan 2025 01:56:01 +0000 Subject: [PATCH 019/165] gitattributes: mark AsciiDoc files as LF-only In a future commit, we'll move the AsciiDoc documentation files to the ".adoc" extension rather than the extension ".txt". We need these files to use only LF because they are read by generate-cmdlist.sh using the read builtin. If we allow CRLF here, the CR at the end of the line is treated as part of the synopsis, since a POSIX shell doesn't consider it special like LF. In that case, we generate synopsis strings in C that contain a CR, which the compiler does not like because it believes that the double quote string terminator is missing, and as a consequence, compilation fails. Because we rely on LF-only endings here to compile successfully and we want Git to continue to be able to compile on Windows, mark these files as LF-only in the .gitattributes file. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 158c3d45c4c..b38cfd499b3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ *.bat text eol=crlf CODE_OF_CONDUCT.md -whitespace /Documentation/**/*.txt text eol=lf +/Documentation/**/*.adoc text eol=lf /command-list.txt text eol=lf /GIT-VERSION-GEN text eol=lf /mergetools/* text eol=lf -- GitLab From 1f010d6bdf756129db13d1367c888aa4153f6d87 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 20 Jan 2025 01:56:02 +0000 Subject: [PATCH 020/165] doc: use .adoc extension for AsciiDoc files We presently use the ".txt" extension for our AsciiDoc files. While not wrong, most editors do not associate this extension with AsciiDoc, meaning that contributors don't get automatic editor functionality that could be useful, such as syntax highlighting and prose linting. It is much more common to use the ".adoc" extension for AsciiDoc files, since this helps editors automatically detect files and also allows various forges to provide rich (HTML-like) rendering. Let's do that here, renaming all of the files and updating the includes where relevant. Adjust the various build scripts and makefiles to use the new extension as well. Note that this should not result in any user-visible changes to the documentation. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- ...eakingChanges.txt => BreakingChanges.adoc} | 0 ...DecisionMaking.txt => DecisionMaking.adoc} | 0 Documentation/Makefile | 200 ++++---- ...tribution.txt => MyFirstContribution.adoc} | 0 ...tObjectWalk.txt => MyFirstObjectWalk.adoc} | 0 .../RelNotes/{1.5.0.1.txt => 1.5.0.1.adoc} | 0 .../RelNotes/{1.5.0.2.txt => 1.5.0.2.adoc} | 0 .../RelNotes/{1.5.0.3.txt => 1.5.0.3.adoc} | 0 .../RelNotes/{1.5.0.4.txt => 1.5.0.4.adoc} | 0 .../RelNotes/{1.5.0.5.txt => 1.5.0.5.adoc} | 0 .../RelNotes/{1.5.0.6.txt => 1.5.0.6.adoc} | 0 .../RelNotes/{1.5.0.7.txt => 1.5.0.7.adoc} | 0 .../RelNotes/{1.5.0.txt => 1.5.0.adoc} | 0 .../RelNotes/{1.5.1.1.txt => 1.5.1.1.adoc} | 0 .../RelNotes/{1.5.1.2.txt => 1.5.1.2.adoc} | 0 .../RelNotes/{1.5.1.3.txt => 1.5.1.3.adoc} | 0 .../RelNotes/{1.5.1.4.txt => 1.5.1.4.adoc} | 0 .../RelNotes/{1.5.1.5.txt => 1.5.1.5.adoc} | 0 .../RelNotes/{1.5.1.6.txt => 1.5.1.6.adoc} | 0 .../RelNotes/{1.5.1.txt => 1.5.1.adoc} | 0 .../RelNotes/{1.5.2.1.txt => 1.5.2.1.adoc} | 0 .../RelNotes/{1.5.2.2.txt => 1.5.2.2.adoc} | 0 .../RelNotes/{1.5.2.3.txt => 1.5.2.3.adoc} | 0 .../RelNotes/{1.5.2.4.txt => 1.5.2.4.adoc} | 0 .../RelNotes/{1.5.2.5.txt => 1.5.2.5.adoc} | 0 .../RelNotes/{1.5.2.txt => 1.5.2.adoc} | 0 .../RelNotes/{1.5.3.1.txt => 1.5.3.1.adoc} | 0 .../RelNotes/{1.5.3.2.txt => 1.5.3.2.adoc} | 0 .../RelNotes/{1.5.3.3.txt => 1.5.3.3.adoc} | 0 .../RelNotes/{1.5.3.4.txt => 1.5.3.4.adoc} | 0 .../RelNotes/{1.5.3.5.txt => 1.5.3.5.adoc} | 0 .../RelNotes/{1.5.3.6.txt => 1.5.3.6.adoc} | 0 .../RelNotes/{1.5.3.7.txt => 1.5.3.7.adoc} | 0 .../RelNotes/{1.5.3.8.txt => 1.5.3.8.adoc} | 0 .../RelNotes/{1.5.3.txt => 1.5.3.adoc} | 0 .../RelNotes/{1.5.4.1.txt => 1.5.4.1.adoc} | 0 .../RelNotes/{1.5.4.2.txt => 1.5.4.2.adoc} | 0 .../RelNotes/{1.5.4.3.txt => 1.5.4.3.adoc} | 0 .../RelNotes/{1.5.4.4.txt => 1.5.4.4.adoc} | 0 .../RelNotes/{1.5.4.5.txt => 1.5.4.5.adoc} | 0 .../RelNotes/{1.5.4.6.txt => 1.5.4.6.adoc} | 0 .../RelNotes/{1.5.4.7.txt => 1.5.4.7.adoc} | 0 .../RelNotes/{1.5.4.txt => 1.5.4.adoc} | 0 .../RelNotes/{1.5.5.1.txt => 1.5.5.1.adoc} | 0 .../RelNotes/{1.5.5.2.txt => 1.5.5.2.adoc} | 0 .../RelNotes/{1.5.5.3.txt => 1.5.5.3.adoc} | 0 .../RelNotes/{1.5.5.4.txt => 1.5.5.4.adoc} | 0 .../RelNotes/{1.5.5.5.txt => 1.5.5.5.adoc} | 0 .../RelNotes/{1.5.5.6.txt => 1.5.5.6.adoc} | 0 .../RelNotes/{1.5.5.txt => 1.5.5.adoc} | 0 .../RelNotes/{1.5.6.1.txt => 1.5.6.1.adoc} | 0 .../RelNotes/{1.5.6.2.txt => 1.5.6.2.adoc} | 0 .../RelNotes/{1.5.6.3.txt => 1.5.6.3.adoc} | 0 .../RelNotes/{1.5.6.4.txt => 1.5.6.4.adoc} | 0 .../RelNotes/{1.5.6.5.txt => 1.5.6.5.adoc} | 0 .../RelNotes/{1.5.6.6.txt => 1.5.6.6.adoc} | 0 .../RelNotes/{1.5.6.txt => 1.5.6.adoc} | 0 .../RelNotes/{1.6.0.1.txt => 1.6.0.1.adoc} | 0 .../RelNotes/{1.6.0.2.txt => 1.6.0.2.adoc} | 0 .../RelNotes/{1.6.0.3.txt => 1.6.0.3.adoc} | 0 .../RelNotes/{1.6.0.4.txt => 1.6.0.4.adoc} | 0 .../RelNotes/{1.6.0.5.txt => 1.6.0.5.adoc} | 0 .../RelNotes/{1.6.0.6.txt => 1.6.0.6.adoc} | 0 .../RelNotes/{1.6.0.txt => 1.6.0.adoc} | 0 .../RelNotes/{1.6.1.1.txt => 1.6.1.1.adoc} | 0 .../RelNotes/{1.6.1.2.txt => 1.6.1.2.adoc} | 0 .../RelNotes/{1.6.1.3.txt => 1.6.1.3.adoc} | 0 .../RelNotes/{1.6.1.4.txt => 1.6.1.4.adoc} | 0 .../RelNotes/{1.6.1.txt => 1.6.1.adoc} | 0 .../RelNotes/{1.6.2.1.txt => 1.6.2.1.adoc} | 0 .../RelNotes/{1.6.2.2.txt => 1.6.2.2.adoc} | 0 .../RelNotes/{1.6.2.3.txt => 1.6.2.3.adoc} | 0 .../RelNotes/{1.6.2.4.txt => 1.6.2.4.adoc} | 0 .../RelNotes/{1.6.2.5.txt => 1.6.2.5.adoc} | 0 .../RelNotes/{1.6.2.txt => 1.6.2.adoc} | 0 .../RelNotes/{1.6.3.1.txt => 1.6.3.1.adoc} | 0 .../RelNotes/{1.6.3.2.txt => 1.6.3.2.adoc} | 0 .../RelNotes/{1.6.3.3.txt => 1.6.3.3.adoc} | 0 .../RelNotes/{1.6.3.4.txt => 1.6.3.4.adoc} | 0 .../RelNotes/{1.6.3.txt => 1.6.3.adoc} | 0 .../RelNotes/{1.6.4.1.txt => 1.6.4.1.adoc} | 0 .../RelNotes/{1.6.4.2.txt => 1.6.4.2.adoc} | 0 .../RelNotes/{1.6.4.3.txt => 1.6.4.3.adoc} | 0 .../RelNotes/{1.6.4.4.txt => 1.6.4.4.adoc} | 0 .../RelNotes/{1.6.4.5.txt => 1.6.4.5.adoc} | 0 .../RelNotes/{1.6.4.txt => 1.6.4.adoc} | 0 .../RelNotes/{1.6.5.1.txt => 1.6.5.1.adoc} | 0 .../RelNotes/{1.6.5.2.txt => 1.6.5.2.adoc} | 0 .../RelNotes/{1.6.5.3.txt => 1.6.5.3.adoc} | 0 .../RelNotes/{1.6.5.4.txt => 1.6.5.4.adoc} | 0 .../RelNotes/{1.6.5.5.txt => 1.6.5.5.adoc} | 0 .../RelNotes/{1.6.5.6.txt => 1.6.5.6.adoc} | 0 .../RelNotes/{1.6.5.7.txt => 1.6.5.7.adoc} | 0 .../RelNotes/{1.6.5.8.txt => 1.6.5.8.adoc} | 0 .../RelNotes/{1.6.5.9.txt => 1.6.5.9.adoc} | 0 .../RelNotes/{1.6.5.txt => 1.6.5.adoc} | 0 .../RelNotes/{1.6.6.1.txt => 1.6.6.1.adoc} | 0 .../RelNotes/{1.6.6.2.txt => 1.6.6.2.adoc} | 0 .../RelNotes/{1.6.6.3.txt => 1.6.6.3.adoc} | 0 .../RelNotes/{1.6.6.txt => 1.6.6.adoc} | 0 .../RelNotes/{1.7.0.1.txt => 1.7.0.1.adoc} | 0 .../RelNotes/{1.7.0.2.txt => 1.7.0.2.adoc} | 0 .../RelNotes/{1.7.0.3.txt => 1.7.0.3.adoc} | 0 .../RelNotes/{1.7.0.4.txt => 1.7.0.4.adoc} | 0 .../RelNotes/{1.7.0.5.txt => 1.7.0.5.adoc} | 0 .../RelNotes/{1.7.0.6.txt => 1.7.0.6.adoc} | 0 .../RelNotes/{1.7.0.7.txt => 1.7.0.7.adoc} | 0 .../RelNotes/{1.7.0.8.txt => 1.7.0.8.adoc} | 0 .../RelNotes/{1.7.0.9.txt => 1.7.0.9.adoc} | 0 .../RelNotes/{1.7.0.txt => 1.7.0.adoc} | 0 .../RelNotes/{1.7.1.1.txt => 1.7.1.1.adoc} | 0 .../RelNotes/{1.7.1.2.txt => 1.7.1.2.adoc} | 0 .../RelNotes/{1.7.1.3.txt => 1.7.1.3.adoc} | 0 .../RelNotes/{1.7.1.4.txt => 1.7.1.4.adoc} | 0 .../RelNotes/{1.7.1.txt => 1.7.1.adoc} | 0 .../RelNotes/{1.7.10.1.txt => 1.7.10.1.adoc} | 0 .../RelNotes/{1.7.10.2.txt => 1.7.10.2.adoc} | 0 .../RelNotes/{1.7.10.3.txt => 1.7.10.3.adoc} | 0 .../RelNotes/{1.7.10.4.txt => 1.7.10.4.adoc} | 0 .../RelNotes/{1.7.10.5.txt => 1.7.10.5.adoc} | 0 .../RelNotes/{1.7.10.txt => 1.7.10.adoc} | 0 .../RelNotes/{1.7.11.1.txt => 1.7.11.1.adoc} | 0 .../RelNotes/{1.7.11.2.txt => 1.7.11.2.adoc} | 0 .../RelNotes/{1.7.11.3.txt => 1.7.11.3.adoc} | 0 .../RelNotes/{1.7.11.4.txt => 1.7.11.4.adoc} | 0 .../RelNotes/{1.7.11.5.txt => 1.7.11.5.adoc} | 0 .../RelNotes/{1.7.11.6.txt => 1.7.11.6.adoc} | 0 .../RelNotes/{1.7.11.7.txt => 1.7.11.7.adoc} | 0 .../RelNotes/{1.7.11.txt => 1.7.11.adoc} | 0 .../RelNotes/{1.7.12.1.txt => 1.7.12.1.adoc} | 0 .../RelNotes/{1.7.12.2.txt => 1.7.12.2.adoc} | 0 .../RelNotes/{1.7.12.3.txt => 1.7.12.3.adoc} | 0 .../RelNotes/{1.7.12.4.txt => 1.7.12.4.adoc} | 0 .../RelNotes/{1.7.12.txt => 1.7.12.adoc} | 0 .../RelNotes/{1.7.2.1.txt => 1.7.2.1.adoc} | 0 .../RelNotes/{1.7.2.2.txt => 1.7.2.2.adoc} | 0 .../RelNotes/{1.7.2.3.txt => 1.7.2.3.adoc} | 0 .../RelNotes/{1.7.2.4.txt => 1.7.2.4.adoc} | 0 .../RelNotes/{1.7.2.5.txt => 1.7.2.5.adoc} | 0 .../RelNotes/{1.7.2.txt => 1.7.2.adoc} | 0 .../RelNotes/{1.7.3.1.txt => 1.7.3.1.adoc} | 0 .../RelNotes/{1.7.3.2.txt => 1.7.3.2.adoc} | 0 .../RelNotes/{1.7.3.3.txt => 1.7.3.3.adoc} | 0 .../RelNotes/{1.7.3.4.txt => 1.7.3.4.adoc} | 0 .../RelNotes/{1.7.3.5.txt => 1.7.3.5.adoc} | 0 .../RelNotes/{1.7.3.txt => 1.7.3.adoc} | 0 .../RelNotes/{1.7.4.1.txt => 1.7.4.1.adoc} | 0 .../RelNotes/{1.7.4.2.txt => 1.7.4.2.adoc} | 0 .../RelNotes/{1.7.4.3.txt => 1.7.4.3.adoc} | 0 .../RelNotes/{1.7.4.4.txt => 1.7.4.4.adoc} | 0 .../RelNotes/{1.7.4.5.txt => 1.7.4.5.adoc} | 0 .../RelNotes/{1.7.4.txt => 1.7.4.adoc} | 0 .../RelNotes/{1.7.5.1.txt => 1.7.5.1.adoc} | 0 .../RelNotes/{1.7.5.2.txt => 1.7.5.2.adoc} | 0 .../RelNotes/{1.7.5.3.txt => 1.7.5.3.adoc} | 0 .../RelNotes/{1.7.5.4.txt => 1.7.5.4.adoc} | 0 .../RelNotes/{1.7.5.txt => 1.7.5.adoc} | 0 .../RelNotes/{1.7.6.1.txt => 1.7.6.1.adoc} | 0 .../RelNotes/{1.7.6.2.txt => 1.7.6.2.adoc} | 0 .../RelNotes/{1.7.6.3.txt => 1.7.6.3.adoc} | 0 .../RelNotes/{1.7.6.4.txt => 1.7.6.4.adoc} | 0 .../RelNotes/{1.7.6.5.txt => 1.7.6.5.adoc} | 0 .../RelNotes/{1.7.6.6.txt => 1.7.6.6.adoc} | 0 .../RelNotes/{1.7.6.txt => 1.7.6.adoc} | 0 .../RelNotes/{1.7.7.1.txt => 1.7.7.1.adoc} | 0 .../RelNotes/{1.7.7.2.txt => 1.7.7.2.adoc} | 0 .../RelNotes/{1.7.7.3.txt => 1.7.7.3.adoc} | 0 .../RelNotes/{1.7.7.4.txt => 1.7.7.4.adoc} | 0 .../RelNotes/{1.7.7.5.txt => 1.7.7.5.adoc} | 0 .../RelNotes/{1.7.7.6.txt => 1.7.7.6.adoc} | 0 .../RelNotes/{1.7.7.7.txt => 1.7.7.7.adoc} | 0 .../RelNotes/{1.7.7.txt => 1.7.7.adoc} | 0 .../RelNotes/{1.7.8.1.txt => 1.7.8.1.adoc} | 0 .../RelNotes/{1.7.8.2.txt => 1.7.8.2.adoc} | 0 .../RelNotes/{1.7.8.3.txt => 1.7.8.3.adoc} | 0 .../RelNotes/{1.7.8.4.txt => 1.7.8.4.adoc} | 0 .../RelNotes/{1.7.8.5.txt => 1.7.8.5.adoc} | 0 .../RelNotes/{1.7.8.6.txt => 1.7.8.6.adoc} | 0 .../RelNotes/{1.7.8.txt => 1.7.8.adoc} | 0 .../RelNotes/{1.7.9.1.txt => 1.7.9.1.adoc} | 0 .../RelNotes/{1.7.9.2.txt => 1.7.9.2.adoc} | 0 .../RelNotes/{1.7.9.3.txt => 1.7.9.3.adoc} | 0 .../RelNotes/{1.7.9.4.txt => 1.7.9.4.adoc} | 0 .../RelNotes/{1.7.9.5.txt => 1.7.9.5.adoc} | 0 .../RelNotes/{1.7.9.6.txt => 1.7.9.6.adoc} | 0 .../RelNotes/{1.7.9.7.txt => 1.7.9.7.adoc} | 0 .../RelNotes/{1.7.9.txt => 1.7.9.adoc} | 0 .../RelNotes/{1.8.0.1.txt => 1.8.0.1.adoc} | 0 .../RelNotes/{1.8.0.2.txt => 1.8.0.2.adoc} | 0 .../RelNotes/{1.8.0.3.txt => 1.8.0.3.adoc} | 0 .../RelNotes/{1.8.0.txt => 1.8.0.adoc} | 0 .../RelNotes/{1.8.1.1.txt => 1.8.1.1.adoc} | 0 .../RelNotes/{1.8.1.2.txt => 1.8.1.2.adoc} | 0 .../RelNotes/{1.8.1.3.txt => 1.8.1.3.adoc} | 0 .../RelNotes/{1.8.1.4.txt => 1.8.1.4.adoc} | 0 .../RelNotes/{1.8.1.5.txt => 1.8.1.5.adoc} | 0 .../RelNotes/{1.8.1.6.txt => 1.8.1.6.adoc} | 0 .../RelNotes/{1.8.1.txt => 1.8.1.adoc} | 0 .../RelNotes/{1.8.2.1.txt => 1.8.2.1.adoc} | 0 .../RelNotes/{1.8.2.2.txt => 1.8.2.2.adoc} | 0 .../RelNotes/{1.8.2.3.txt => 1.8.2.3.adoc} | 0 .../RelNotes/{1.8.2.txt => 1.8.2.adoc} | 0 .../RelNotes/{1.8.3.1.txt => 1.8.3.1.adoc} | 0 .../RelNotes/{1.8.3.2.txt => 1.8.3.2.adoc} | 0 .../RelNotes/{1.8.3.3.txt => 1.8.3.3.adoc} | 0 .../RelNotes/{1.8.3.4.txt => 1.8.3.4.adoc} | 0 .../RelNotes/{1.8.3.txt => 1.8.3.adoc} | 0 .../RelNotes/{1.8.4.1.txt => 1.8.4.1.adoc} | 0 .../RelNotes/{1.8.4.2.txt => 1.8.4.2.adoc} | 0 .../RelNotes/{1.8.4.3.txt => 1.8.4.3.adoc} | 0 .../RelNotes/{1.8.4.4.txt => 1.8.4.4.adoc} | 0 .../RelNotes/{1.8.4.5.txt => 1.8.4.5.adoc} | 0 .../RelNotes/{1.8.4.txt => 1.8.4.adoc} | 0 .../RelNotes/{1.8.5.1.txt => 1.8.5.1.adoc} | 0 .../RelNotes/{1.8.5.2.txt => 1.8.5.2.adoc} | 0 .../RelNotes/{1.8.5.3.txt => 1.8.5.3.adoc} | 0 .../RelNotes/{1.8.5.4.txt => 1.8.5.4.adoc} | 0 .../RelNotes/{1.8.5.5.txt => 1.8.5.5.adoc} | 0 .../RelNotes/{1.8.5.6.txt => 1.8.5.6.adoc} | 0 .../RelNotes/{1.8.5.txt => 1.8.5.adoc} | 0 .../RelNotes/{1.9.0.txt => 1.9.0.adoc} | 0 .../RelNotes/{1.9.1.txt => 1.9.1.adoc} | 0 .../RelNotes/{1.9.2.txt => 1.9.2.adoc} | 0 .../RelNotes/{1.9.3.txt => 1.9.3.adoc} | 0 .../RelNotes/{1.9.4.txt => 1.9.4.adoc} | 0 .../RelNotes/{1.9.5.txt => 1.9.5.adoc} | 0 .../RelNotes/{2.0.0.txt => 2.0.0.adoc} | 0 .../RelNotes/{2.0.1.txt => 2.0.1.adoc} | 0 .../RelNotes/{2.0.2.txt => 2.0.2.adoc} | 0 .../RelNotes/{2.0.3.txt => 2.0.3.adoc} | 0 .../RelNotes/{2.0.4.txt => 2.0.4.adoc} | 0 .../RelNotes/{2.0.5.txt => 2.0.5.adoc} | 0 .../RelNotes/{2.1.0.txt => 2.1.0.adoc} | 0 .../RelNotes/{2.1.1.txt => 2.1.1.adoc} | 0 .../RelNotes/{2.1.2.txt => 2.1.2.adoc} | 0 .../RelNotes/{2.1.3.txt => 2.1.3.adoc} | 0 .../RelNotes/{2.1.4.txt => 2.1.4.adoc} | 0 .../RelNotes/{2.10.0.txt => 2.10.0.adoc} | 0 .../RelNotes/{2.10.1.txt => 2.10.1.adoc} | 0 .../RelNotes/{2.10.2.txt => 2.10.2.adoc} | 0 .../RelNotes/{2.10.3.txt => 2.10.3.adoc} | 0 .../RelNotes/{2.10.4.txt => 2.10.4.adoc} | 0 .../RelNotes/{2.10.5.txt => 2.10.5.adoc} | 0 .../RelNotes/{2.11.0.txt => 2.11.0.adoc} | 0 .../RelNotes/{2.11.1.txt => 2.11.1.adoc} | 0 .../RelNotes/{2.11.2.txt => 2.11.2.adoc} | 0 .../RelNotes/{2.11.3.txt => 2.11.3.adoc} | 0 .../RelNotes/{2.11.4.txt => 2.11.4.adoc} | 0 .../RelNotes/{2.12.0.txt => 2.12.0.adoc} | 0 .../RelNotes/{2.12.1.txt => 2.12.1.adoc} | 0 .../RelNotes/{2.12.2.txt => 2.12.2.adoc} | 0 .../RelNotes/{2.12.3.txt => 2.12.3.adoc} | 0 .../RelNotes/{2.12.4.txt => 2.12.4.adoc} | 0 .../RelNotes/{2.12.5.txt => 2.12.5.adoc} | 0 .../RelNotes/{2.13.0.txt => 2.13.0.adoc} | 0 .../RelNotes/{2.13.1.txt => 2.13.1.adoc} | 0 .../RelNotes/{2.13.2.txt => 2.13.2.adoc} | 0 .../RelNotes/{2.13.3.txt => 2.13.3.adoc} | 0 .../RelNotes/{2.13.4.txt => 2.13.4.adoc} | 0 .../RelNotes/{2.13.5.txt => 2.13.5.adoc} | 0 .../RelNotes/{2.13.6.txt => 2.13.6.adoc} | 0 .../RelNotes/{2.13.7.txt => 2.13.7.adoc} | 0 .../RelNotes/{2.14.0.txt => 2.14.0.adoc} | 0 .../RelNotes/{2.14.1.txt => 2.14.1.adoc} | 0 .../RelNotes/{2.14.2.txt => 2.14.2.adoc} | 0 .../RelNotes/{2.14.3.txt => 2.14.3.adoc} | 0 .../RelNotes/{2.14.4.txt => 2.14.4.adoc} | 0 .../RelNotes/{2.14.5.txt => 2.14.5.adoc} | 0 .../RelNotes/{2.14.6.txt => 2.14.6.adoc} | 0 .../RelNotes/{2.15.0.txt => 2.15.0.adoc} | 0 .../RelNotes/{2.15.1.txt => 2.15.1.adoc} | 0 .../RelNotes/{2.15.2.txt => 2.15.2.adoc} | 0 .../RelNotes/{2.15.3.txt => 2.15.3.adoc} | 0 .../RelNotes/{2.15.4.txt => 2.15.4.adoc} | 0 .../RelNotes/{2.16.0.txt => 2.16.0.adoc} | 0 .../RelNotes/{2.16.1.txt => 2.16.1.adoc} | 0 .../RelNotes/{2.16.2.txt => 2.16.2.adoc} | 0 .../RelNotes/{2.16.3.txt => 2.16.3.adoc} | 0 .../RelNotes/{2.16.4.txt => 2.16.4.adoc} | 0 .../RelNotes/{2.16.5.txt => 2.16.5.adoc} | 0 .../RelNotes/{2.16.6.txt => 2.16.6.adoc} | 0 .../RelNotes/{2.17.0.txt => 2.17.0.adoc} | 0 .../RelNotes/{2.17.1.txt => 2.17.1.adoc} | 0 .../RelNotes/{2.17.2.txt => 2.17.2.adoc} | 0 .../RelNotes/{2.17.3.txt => 2.17.3.adoc} | 0 .../RelNotes/{2.17.4.txt => 2.17.4.adoc} | 0 .../RelNotes/{2.17.5.txt => 2.17.5.adoc} | 0 .../RelNotes/{2.17.6.txt => 2.17.6.adoc} | 0 .../RelNotes/{2.18.0.txt => 2.18.0.adoc} | 0 .../RelNotes/{2.18.1.txt => 2.18.1.adoc} | 0 .../RelNotes/{2.18.2.txt => 2.18.2.adoc} | 0 .../RelNotes/{2.18.3.txt => 2.18.3.adoc} | 0 .../RelNotes/{2.18.4.txt => 2.18.4.adoc} | 0 .../RelNotes/{2.18.5.txt => 2.18.5.adoc} | 0 .../RelNotes/{2.19.0.txt => 2.19.0.adoc} | 0 .../RelNotes/{2.19.1.txt => 2.19.1.adoc} | 0 .../RelNotes/{2.19.2.txt => 2.19.2.adoc} | 0 .../RelNotes/{2.19.3.txt => 2.19.3.adoc} | 0 .../RelNotes/{2.19.4.txt => 2.19.4.adoc} | 0 .../RelNotes/{2.19.5.txt => 2.19.5.adoc} | 0 .../RelNotes/{2.19.6.txt => 2.19.6.adoc} | 0 .../RelNotes/{2.2.0.txt => 2.2.0.adoc} | 0 .../RelNotes/{2.2.1.txt => 2.2.1.adoc} | 0 .../RelNotes/{2.2.2.txt => 2.2.2.adoc} | 0 .../RelNotes/{2.2.3.txt => 2.2.3.adoc} | 0 .../RelNotes/{2.20.0.txt => 2.20.0.adoc} | 0 .../RelNotes/{2.20.1.txt => 2.20.1.adoc} | 0 .../RelNotes/{2.20.2.txt => 2.20.2.adoc} | 0 .../RelNotes/{2.20.3.txt => 2.20.3.adoc} | 0 .../RelNotes/{2.20.4.txt => 2.20.4.adoc} | 0 .../RelNotes/{2.20.5.txt => 2.20.5.adoc} | 0 .../RelNotes/{2.21.0.txt => 2.21.0.adoc} | 0 .../RelNotes/{2.21.1.txt => 2.21.1.adoc} | 0 .../RelNotes/{2.21.2.txt => 2.21.2.adoc} | 0 .../RelNotes/{2.21.3.txt => 2.21.3.adoc} | 0 .../RelNotes/{2.21.4.txt => 2.21.4.adoc} | 0 .../RelNotes/{2.22.0.txt => 2.22.0.adoc} | 0 .../RelNotes/{2.22.1.txt => 2.22.1.adoc} | 0 .../RelNotes/{2.22.2.txt => 2.22.2.adoc} | 0 .../RelNotes/{2.22.3.txt => 2.22.3.adoc} | 0 .../RelNotes/{2.22.4.txt => 2.22.4.adoc} | 0 .../RelNotes/{2.22.5.txt => 2.22.5.adoc} | 0 .../RelNotes/{2.23.0.txt => 2.23.0.adoc} | 0 .../RelNotes/{2.23.1.txt => 2.23.1.adoc} | 0 .../RelNotes/{2.23.2.txt => 2.23.2.adoc} | 0 .../RelNotes/{2.23.3.txt => 2.23.3.adoc} | 0 .../RelNotes/{2.23.4.txt => 2.23.4.adoc} | 0 .../RelNotes/{2.24.0.txt => 2.24.0.adoc} | 0 .../RelNotes/{2.24.1.txt => 2.24.1.adoc} | 0 .../RelNotes/{2.24.2.txt => 2.24.2.adoc} | 0 .../RelNotes/{2.24.3.txt => 2.24.3.adoc} | 0 .../RelNotes/{2.24.4.txt => 2.24.4.adoc} | 0 .../RelNotes/{2.25.0.txt => 2.25.0.adoc} | 0 .../RelNotes/{2.25.1.txt => 2.25.1.adoc} | 0 .../RelNotes/{2.25.2.txt => 2.25.2.adoc} | 0 .../RelNotes/{2.25.3.txt => 2.25.3.adoc} | 0 .../RelNotes/{2.25.4.txt => 2.25.4.adoc} | 0 .../RelNotes/{2.25.5.txt => 2.25.5.adoc} | 0 .../RelNotes/{2.26.0.txt => 2.26.0.adoc} | 0 .../RelNotes/{2.26.1.txt => 2.26.1.adoc} | 0 .../RelNotes/{2.26.2.txt => 2.26.2.adoc} | 0 .../RelNotes/{2.26.3.txt => 2.26.3.adoc} | 0 .../RelNotes/{2.27.0.txt => 2.27.0.adoc} | 0 .../RelNotes/{2.27.1.txt => 2.27.1.adoc} | 0 .../RelNotes/{2.28.0.txt => 2.28.0.adoc} | 0 .../RelNotes/{2.28.1.txt => 2.28.1.adoc} | 0 .../RelNotes/{2.29.0.txt => 2.29.0.adoc} | 0 .../RelNotes/{2.29.1.txt => 2.29.1.adoc} | 0 .../RelNotes/{2.29.2.txt => 2.29.2.adoc} | 0 .../RelNotes/{2.29.3.txt => 2.29.3.adoc} | 0 .../RelNotes/{2.3.0.txt => 2.3.0.adoc} | 0 .../RelNotes/{2.3.1.txt => 2.3.1.adoc} | 0 .../RelNotes/{2.3.10.txt => 2.3.10.adoc} | 0 .../RelNotes/{2.3.2.txt => 2.3.2.adoc} | 0 .../RelNotes/{2.3.3.txt => 2.3.3.adoc} | 0 .../RelNotes/{2.3.4.txt => 2.3.4.adoc} | 0 .../RelNotes/{2.3.5.txt => 2.3.5.adoc} | 0 .../RelNotes/{2.3.6.txt => 2.3.6.adoc} | 0 .../RelNotes/{2.3.7.txt => 2.3.7.adoc} | 0 .../RelNotes/{2.3.8.txt => 2.3.8.adoc} | 0 .../RelNotes/{2.3.9.txt => 2.3.9.adoc} | 0 .../RelNotes/{2.30.0.txt => 2.30.0.adoc} | 0 .../RelNotes/{2.30.1.txt => 2.30.1.adoc} | 0 .../RelNotes/{2.30.2.txt => 2.30.2.adoc} | 0 .../RelNotes/{2.30.3.txt => 2.30.3.adoc} | 0 .../RelNotes/{2.30.4.txt => 2.30.4.adoc} | 0 .../RelNotes/{2.30.5.txt => 2.30.5.adoc} | 0 .../RelNotes/{2.30.6.txt => 2.30.6.adoc} | 0 .../RelNotes/{2.30.7.txt => 2.30.7.adoc} | 0 .../RelNotes/{2.30.8.txt => 2.30.8.adoc} | 0 .../RelNotes/{2.30.9.txt => 2.30.9.adoc} | 0 .../RelNotes/{2.31.0.txt => 2.31.0.adoc} | 0 .../RelNotes/{2.31.1.txt => 2.31.1.adoc} | 0 .../RelNotes/{2.31.2.txt => 2.31.2.adoc} | 0 .../RelNotes/{2.31.3.txt => 2.31.3.adoc} | 0 .../RelNotes/{2.31.4.txt => 2.31.4.adoc} | 0 .../RelNotes/{2.31.5.txt => 2.31.5.adoc} | 0 .../RelNotes/{2.31.6.txt => 2.31.6.adoc} | 0 .../RelNotes/{2.31.7.txt => 2.31.7.adoc} | 0 .../RelNotes/{2.31.8.txt => 2.31.8.adoc} | 0 .../RelNotes/{2.32.0.txt => 2.32.0.adoc} | 0 .../RelNotes/{2.32.1.txt => 2.32.1.adoc} | 0 .../RelNotes/{2.32.2.txt => 2.32.2.adoc} | 0 .../RelNotes/{2.32.3.txt => 2.32.3.adoc} | 0 .../RelNotes/{2.32.4.txt => 2.32.4.adoc} | 0 .../RelNotes/{2.32.5.txt => 2.32.5.adoc} | 0 .../RelNotes/{2.32.6.txt => 2.32.6.adoc} | 0 .../RelNotes/{2.32.7.txt => 2.32.7.adoc} | 0 .../RelNotes/{2.33.0.txt => 2.33.0.adoc} | 0 .../RelNotes/{2.33.1.txt => 2.33.1.adoc} | 0 .../RelNotes/{2.33.2.txt => 2.33.2.adoc} | 0 .../RelNotes/{2.33.3.txt => 2.33.3.adoc} | 0 .../RelNotes/{2.33.4.txt => 2.33.4.adoc} | 0 .../RelNotes/{2.33.5.txt => 2.33.5.adoc} | 0 .../RelNotes/{2.33.6.txt => 2.33.6.adoc} | 0 .../RelNotes/{2.33.7.txt => 2.33.7.adoc} | 0 .../RelNotes/{2.33.8.txt => 2.33.8.adoc} | 0 .../RelNotes/{2.34.0.txt => 2.34.0.adoc} | 0 .../RelNotes/{2.34.1.txt => 2.34.1.adoc} | 0 .../RelNotes/{2.34.2.txt => 2.34.2.adoc} | 0 .../RelNotes/{2.34.3.txt => 2.34.3.adoc} | 0 .../RelNotes/{2.34.4.txt => 2.34.4.adoc} | 0 .../RelNotes/{2.34.5.txt => 2.34.5.adoc} | 0 .../RelNotes/{2.34.6.txt => 2.34.6.adoc} | 0 .../RelNotes/{2.34.7.txt => 2.34.7.adoc} | 0 .../RelNotes/{2.34.8.txt => 2.34.8.adoc} | 0 .../RelNotes/{2.35.0.txt => 2.35.0.adoc} | 0 .../RelNotes/{2.35.1.txt => 2.35.1.adoc} | 0 .../RelNotes/{2.35.2.txt => 2.35.2.adoc} | 0 .../RelNotes/{2.35.3.txt => 2.35.3.adoc} | 0 .../RelNotes/{2.35.4.txt => 2.35.4.adoc} | 0 .../RelNotes/{2.35.5.txt => 2.35.5.adoc} | 0 .../RelNotes/{2.35.6.txt => 2.35.6.adoc} | 0 .../RelNotes/{2.35.7.txt => 2.35.7.adoc} | 0 .../RelNotes/{2.35.8.txt => 2.35.8.adoc} | 0 .../RelNotes/{2.36.0.txt => 2.36.0.adoc} | 0 .../RelNotes/{2.36.1.txt => 2.36.1.adoc} | 0 .../RelNotes/{2.36.2.txt => 2.36.2.adoc} | 0 .../RelNotes/{2.36.3.txt => 2.36.3.adoc} | 0 .../RelNotes/{2.36.4.txt => 2.36.4.adoc} | 0 .../RelNotes/{2.36.5.txt => 2.36.5.adoc} | 0 .../RelNotes/{2.36.6.txt => 2.36.6.adoc} | 0 .../RelNotes/{2.37.0.txt => 2.37.0.adoc} | 0 .../RelNotes/{2.37.1.txt => 2.37.1.adoc} | 0 .../RelNotes/{2.37.2.txt => 2.37.2.adoc} | 0 .../RelNotes/{2.37.3.txt => 2.37.3.adoc} | 0 .../RelNotes/{2.37.4.txt => 2.37.4.adoc} | 0 .../RelNotes/{2.37.5.txt => 2.37.5.adoc} | 0 .../RelNotes/{2.37.6.txt => 2.37.6.adoc} | 0 .../RelNotes/{2.37.7.txt => 2.37.7.adoc} | 0 .../RelNotes/{2.38.0.txt => 2.38.0.adoc} | 0 .../RelNotes/{2.38.1.txt => 2.38.1.adoc} | 0 .../RelNotes/{2.38.2.txt => 2.38.2.adoc} | 0 .../RelNotes/{2.38.3.txt => 2.38.3.adoc} | 0 .../RelNotes/{2.38.4.txt => 2.38.4.adoc} | 0 .../RelNotes/{2.38.5.txt => 2.38.5.adoc} | 0 .../RelNotes/{2.39.0.txt => 2.39.0.adoc} | 0 .../RelNotes/{2.39.1.txt => 2.39.1.adoc} | 0 .../RelNotes/{2.39.2.txt => 2.39.2.adoc} | 0 .../RelNotes/{2.39.3.txt => 2.39.3.adoc} | 0 .../RelNotes/{2.39.4.txt => 2.39.4.adoc} | 0 .../RelNotes/{2.39.5.txt => 2.39.5.adoc} | 0 .../RelNotes/{2.4.0.txt => 2.4.0.adoc} | 0 .../RelNotes/{2.4.1.txt => 2.4.1.adoc} | 0 .../RelNotes/{2.4.10.txt => 2.4.10.adoc} | 0 .../RelNotes/{2.4.11.txt => 2.4.11.adoc} | 0 .../RelNotes/{2.4.12.txt => 2.4.12.adoc} | 0 .../RelNotes/{2.4.2.txt => 2.4.2.adoc} | 0 .../RelNotes/{2.4.3.txt => 2.4.3.adoc} | 0 .../RelNotes/{2.4.4.txt => 2.4.4.adoc} | 0 .../RelNotes/{2.4.5.txt => 2.4.5.adoc} | 0 .../RelNotes/{2.4.6.txt => 2.4.6.adoc} | 0 .../RelNotes/{2.4.7.txt => 2.4.7.adoc} | 0 .../RelNotes/{2.4.8.txt => 2.4.8.adoc} | 0 .../RelNotes/{2.4.9.txt => 2.4.9.adoc} | 0 .../RelNotes/{2.40.0.txt => 2.40.0.adoc} | 0 .../RelNotes/{2.40.1.txt => 2.40.1.adoc} | 0 .../RelNotes/{2.40.2.txt => 2.40.2.adoc} | 0 .../RelNotes/{2.40.3.txt => 2.40.3.adoc} | 0 .../RelNotes/{2.40.4.txt => 2.40.4.adoc} | 0 .../RelNotes/{2.41.0.txt => 2.41.0.adoc} | 0 .../RelNotes/{2.41.1.txt => 2.41.1.adoc} | 0 .../RelNotes/{2.41.2.txt => 2.41.2.adoc} | 0 .../RelNotes/{2.41.3.txt => 2.41.3.adoc} | 0 .../RelNotes/{2.42.0.txt => 2.42.0.adoc} | 0 .../RelNotes/{2.42.1.txt => 2.42.1.adoc} | 0 .../RelNotes/{2.42.2.txt => 2.42.2.adoc} | 0 .../RelNotes/{2.42.3.txt => 2.42.3.adoc} | 0 .../RelNotes/{2.42.4.txt => 2.42.4.adoc} | 0 .../RelNotes/{2.43.0.txt => 2.43.0.adoc} | 0 .../RelNotes/{2.43.1.txt => 2.43.1.adoc} | 0 .../RelNotes/{2.43.2.txt => 2.43.2.adoc} | 0 .../RelNotes/{2.43.3.txt => 2.43.3.adoc} | 0 .../RelNotes/{2.43.4.txt => 2.43.4.adoc} | 0 .../RelNotes/{2.43.5.txt => 2.43.5.adoc} | 0 .../RelNotes/{2.43.6.txt => 2.43.6.adoc} | 0 .../RelNotes/{2.44.0.txt => 2.44.0.adoc} | 0 .../RelNotes/{2.44.1.txt => 2.44.1.adoc} | 0 .../RelNotes/{2.44.2.txt => 2.44.2.adoc} | 0 .../RelNotes/{2.44.3.txt => 2.44.3.adoc} | 0 .../RelNotes/{2.45.0.txt => 2.45.0.adoc} | 0 .../RelNotes/{2.45.1.txt => 2.45.1.adoc} | 0 .../RelNotes/{2.45.2.txt => 2.45.2.adoc} | 0 .../RelNotes/{2.45.3.txt => 2.45.3.adoc} | 0 .../RelNotes/{2.46.0.txt => 2.46.0.adoc} | 0 .../RelNotes/{2.46.1.txt => 2.46.1.adoc} | 0 .../RelNotes/{2.46.2.txt => 2.46.2.adoc} | 0 .../RelNotes/{2.46.3.txt => 2.46.3.adoc} | 0 .../RelNotes/{2.47.0.txt => 2.47.0.adoc} | 0 .../RelNotes/{2.47.1.txt => 2.47.1.adoc} | 0 .../RelNotes/{2.47.2.txt => 2.47.2.adoc} | 0 .../RelNotes/{2.48.0.txt => 2.48.0.adoc} | 0 .../RelNotes/{2.48.1.txt => 2.48.1.adoc} | 0 .../RelNotes/{2.49.0.txt => 2.49.0.adoc} | 0 .../RelNotes/{2.5.0.txt => 2.5.0.adoc} | 0 .../RelNotes/{2.5.1.txt => 2.5.1.adoc} | 0 .../RelNotes/{2.5.2.txt => 2.5.2.adoc} | 0 .../RelNotes/{2.5.3.txt => 2.5.3.adoc} | 0 .../RelNotes/{2.5.4.txt => 2.5.4.adoc} | 0 .../RelNotes/{2.5.5.txt => 2.5.5.adoc} | 0 .../RelNotes/{2.5.6.txt => 2.5.6.adoc} | 0 .../RelNotes/{2.6.0.txt => 2.6.0.adoc} | 0 .../RelNotes/{2.6.1.txt => 2.6.1.adoc} | 0 .../RelNotes/{2.6.2.txt => 2.6.2.adoc} | 0 .../RelNotes/{2.6.3.txt => 2.6.3.adoc} | 0 .../RelNotes/{2.6.4.txt => 2.6.4.adoc} | 0 .../RelNotes/{2.6.5.txt => 2.6.5.adoc} | 0 .../RelNotes/{2.6.6.txt => 2.6.6.adoc} | 0 .../RelNotes/{2.6.7.txt => 2.6.7.adoc} | 0 .../RelNotes/{2.7.0.txt => 2.7.0.adoc} | 0 .../RelNotes/{2.7.1.txt => 2.7.1.adoc} | 0 .../RelNotes/{2.7.2.txt => 2.7.2.adoc} | 0 .../RelNotes/{2.7.3.txt => 2.7.3.adoc} | 0 .../RelNotes/{2.7.4.txt => 2.7.4.adoc} | 0 .../RelNotes/{2.7.5.txt => 2.7.5.adoc} | 0 .../RelNotes/{2.7.6.txt => 2.7.6.adoc} | 0 .../RelNotes/{2.8.0.txt => 2.8.0.adoc} | 0 .../RelNotes/{2.8.1.txt => 2.8.1.adoc} | 0 .../RelNotes/{2.8.2.txt => 2.8.2.adoc} | 0 .../RelNotes/{2.8.3.txt => 2.8.3.adoc} | 0 .../RelNotes/{2.8.4.txt => 2.8.4.adoc} | 0 .../RelNotes/{2.8.5.txt => 2.8.5.adoc} | 0 .../RelNotes/{2.8.6.txt => 2.8.6.adoc} | 0 .../RelNotes/{2.9.0.txt => 2.9.0.adoc} | 0 .../RelNotes/{2.9.1.txt => 2.9.1.adoc} | 0 .../RelNotes/{2.9.2.txt => 2.9.2.adoc} | 0 .../RelNotes/{2.9.3.txt => 2.9.3.adoc} | 0 .../RelNotes/{2.9.4.txt => 2.9.4.adoc} | 0 .../RelNotes/{2.9.5.txt => 2.9.5.adoc} | 0 ...uidelines.txt => ReviewingGuidelines.adoc} | 0 .../{ToolsForGit.txt => ToolsForGit.adoc} | 0 .../{blame-options.txt => blame-options.adoc} | 2 +- Documentation/cmd-list.perl | 8 +- Documentation/{config.txt => config.adoc} | 184 ++++---- Documentation/config/{add.txt => add.adoc} | 0 .../config/{advice.txt => advice.adoc} | 0 .../config/{alias.txt => alias.adoc} | 0 Documentation/config/{am.txt => am.adoc} | 0 .../config/{apply.txt => apply.adoc} | 0 Documentation/config/{attr.txt => attr.adoc} | 0 ...udo-merge.txt => bitmap-pseudo-merge.adoc} | 0 .../config/{blame.txt => blame.adoc} | 0 .../config/{branch.txt => branch.adoc} | 0 .../config/{browser.txt => browser.adoc} | 0 .../config/{bundle.txt => bundle.adoc} | 0 .../config/{checkout.txt => checkout.adoc} | 0 .../config/{clean.txt => clean.adoc} | 0 .../config/{clone.txt => clone.adoc} | 0 .../config/{color.txt => color.adoc} | 0 .../config/{column.txt => column.adoc} | 0 .../config/{commit.txt => commit.adoc} | 0 .../{commitgraph.txt => commitgraph.adoc} | 0 .../{completion.txt => completion.adoc} | 0 Documentation/config/{core.txt => core.adoc} | 0 .../{credential.txt => credential.adoc} | 0 Documentation/config/{diff.txt => diff.adoc} | 2 +- .../config/{difftool.txt => difftool.adoc} | 0 .../{extensions.txt => extensions.adoc} | 2 +- .../{fastimport.txt => fastimport.adoc} | 0 .../config/{feature.txt => feature.adoc} | 0 .../config/{fetch.txt => fetch.adoc} | 0 .../config/{filter.txt => filter.adoc} | 0 .../{fmt-merge-msg.txt => fmt-merge-msg.adoc} | 0 .../config/{format.txt => format.adoc} | 0 Documentation/config/{fsck.txt => fsck.adoc} | 0 ...tor--daemon.txt => fsmonitor--daemon.adoc} | 0 Documentation/config/{gc.txt => gc.adoc} | 0 .../config/{gitcvs.txt => gitcvs.adoc} | 0 .../config/{gitweb.txt => gitweb.adoc} | 0 Documentation/config/{gpg.txt => gpg.adoc} | 0 Documentation/config/{grep.txt => grep.adoc} | 0 Documentation/config/{gui.txt => gui.adoc} | 0 .../config/{guitool.txt => guitool.adoc} | 0 Documentation/config/{help.txt => help.adoc} | 0 Documentation/config/{http.txt => http.adoc} | 0 Documentation/config/{i18n.txt => i18n.adoc} | 0 Documentation/config/{imap.txt => imap.adoc} | 0 .../config/{includeif.txt => includeif.adoc} | 0 .../config/{index.txt => index.adoc} | 0 Documentation/config/{init.txt => init.adoc} | 0 .../config/{instaweb.txt => instaweb.adoc} | 0 .../{interactive.txt => interactive.adoc} | 0 Documentation/config/{log.txt => log.adoc} | 0 .../config/{lsrefs.txt => lsrefs.adoc} | 0 .../config/{mailinfo.txt => mailinfo.adoc} | 0 .../config/{mailmap.txt => mailmap.adoc} | 0 .../{maintenance.txt => maintenance.adoc} | 0 Documentation/config/{man.txt => man.adoc} | 0 .../config/{merge.txt => merge.adoc} | 4 +- .../config/{mergetool.txt => mergetool.adoc} | 0 .../config/{notes.txt => notes.adoc} | 0 Documentation/config/{pack.txt => pack.adoc} | 0 .../config/{pager.txt => pager.adoc} | 0 .../config/{pretty.txt => pretty.adoc} | 0 .../config/{promisor.txt => promisor.adoc} | 0 .../config/{protocol.txt => protocol.adoc} | 0 Documentation/config/{pull.txt => pull.adoc} | 0 Documentation/config/{push.txt => push.adoc} | 0 .../config/{rebase.txt => rebase.adoc} | 0 .../config/{receive.txt => receive.adoc} | 0 .../config/{reftable.txt => reftable.adoc} | 0 .../config/{remote.txt => remote.adoc} | 0 .../config/{remotes.txt => remotes.adoc} | 0 .../config/{repack.txt => repack.adoc} | 0 .../config/{rerere.txt => rerere.adoc} | 0 .../config/{revert.txt => revert.adoc} | 0 Documentation/config/{safe.txt => safe.adoc} | 0 .../config/{sendemail.txt => sendemail.adoc} | 0 .../config/{sequencer.txt => sequencer.adoc} | 0 .../{showbranch.txt => showbranch.adoc} | 0 .../config/{sparse.txt => sparse.adoc} | 0 .../{splitindex.txt => splitindex.adoc} | 0 Documentation/config/{ssh.txt => ssh.adoc} | 0 .../config/{stash.txt => stash.adoc} | 0 .../config/{status.txt => status.adoc} | 0 .../config/{submodule.txt => submodule.adoc} | 0 Documentation/config/{tag.txt => tag.adoc} | 0 Documentation/config/{tar.txt => tar.adoc} | 0 .../config/{trace2.txt => trace2.adoc} | 2 +- .../config/{transfer.txt => transfer.adoc} | 0 .../{uploadarchive.txt => uploadarchive.adoc} | 0 .../{uploadpack.txt => uploadpack.adoc} | 0 Documentation/config/{url.txt => url.adoc} | 0 Documentation/config/{user.txt => user.adoc} | 0 .../{versionsort.txt => versionsort.adoc} | 0 Documentation/config/{web.txt => web.adoc} | 0 .../config/{worktree.txt => worktree.adoc} | 0 .../{date-formats.txt => date-formats.adoc} | 0 .../{diff-format.txt => diff-format.adoc} | 2 +- ...ate-patch.txt => diff-generate-patch.adoc} | 0 .../{diff-options.txt => diff-options.adoc} | 0 .../{everyday.txto => everyday.adoco} | 0 .../{fetch-options.txt => fetch-options.adoc} | 0 .../{fsck-msgids.txt => fsck-msgids.adoc} | 0 Documentation/{git-add.txt => git-add.adoc} | 4 +- Documentation/{git-am.txt => git-am.adoc} | 6 +- .../{git-annotate.txt => git-annotate.adoc} | 2 +- .../{git-apply.txt => git-apply.adoc} | 4 +- ...git-archimport.txt => git-archimport.adoc} | 0 .../{git-archive.txt => git-archive.adoc} | 0 ...sect-lk2009.txt => git-bisect-lk2009.adoc} | 0 .../{git-bisect.txt => git-bisect.adoc} | 0 .../{git-blame.txt => git-blame.adoc} | 6 +- .../{git-branch.txt => git-branch.adoc} | 6 +- .../{git-bugreport.txt => git-bugreport.adoc} | 0 .../{git-bundle.txt => git-bundle.adoc} | 0 .../{git-cat-file.txt => git-cat-file.adoc} | 0 ...git-check-attr.txt => git-check-attr.adoc} | 0 ...check-ignore.txt => git-check-ignore.adoc} | 0 ...eck-mailmap.txt => git-check-mailmap.adoc} | 0 ...f-format.txt => git-check-ref-format.adoc} | 0 ...kout-index.txt => git-checkout-index.adoc} | 0 .../{git-checkout.txt => git-checkout.adoc} | 4 +- ...t-cherry-pick.txt => git-cherry-pick.adoc} | 4 +- .../{git-cherry.txt => git-cherry.adoc} | 0 .../{git-citool.txt => git-citool.adoc} | 0 .../{git-clean.txt => git-clean.adoc} | 4 +- .../{git-clone.txt => git-clone.adoc} | 10 +- .../{git-column.txt => git-column.adoc} | 4 +- ...commit-graph.txt => git-commit-graph.adoc} | 4 +- ...t-commit-tree.txt => git-commit-tree.adoc} | 4 +- .../{git-commit.txt => git-commit.adoc} | 10 +- .../{git-config.txt => git-config.adoc} | 2 +- ...unt-objects.txt => git-count-objects.adoc} | 0 ....txt => git-credential-cache--daemon.adoc} | 0 ...al-cache.txt => git-credential-cache.adoc} | 0 ...al-store.txt => git-credential-store.adoc} | 0 ...git-credential.txt => git-credential.adoc} | 0 ...ortcommit.txt => git-cvsexportcommit.adoc} | 0 .../{git-cvsimport.txt => git-cvsimport.adoc} | 0 .../{git-cvsserver.txt => git-cvsserver.adoc} | 0 .../{git-daemon.txt => git-daemon.adoc} | 0 .../{git-describe.txt => git-describe.adoc} | 0 .../{git-diagnose.txt => git-diagnose.adoc} | 0 ...git-diff-files.txt => git-diff-files.adoc} | 4 +- ...git-diff-index.txt => git-diff-index.adoc} | 4 +- .../{git-diff-tree.txt => git-diff-tree.adoc} | 8 +- Documentation/{git-diff.txt => git-diff.adoc} | 8 +- .../{git-difftool.txt => git-difftool.adoc} | 4 +- ...t-fast-export.txt => git-fast-export.adoc} | 0 ...t-fast-import.txt => git-fast-import.adoc} | 4 +- ...git-fetch-pack.txt => git-fetch-pack.adoc} | 0 .../{git-fetch.txt => git-fetch.adoc} | 12 +- ...lter-branch.txt => git-filter-branch.adoc} | 0 ...t-merge-msg.txt => git-fmt-merge-msg.adoc} | 2 +- ...for-each-ref.txt => git-for-each-ref.adoc} | 2 +- ...r-each-repo.txt => git-for-each-repo.adoc} | 0 ...format-patch.txt => git-format-patch.adoc} | 2 +- ...fsck-objects.txt => git-fsck-objects.adoc} | 0 Documentation/{git-fsck.txt => git-fsck.adoc} | 6 +- ...-daemon.txt => git-fsmonitor--daemon.adoc} | 4 +- Documentation/{git-gc.txt => git-gc.adoc} | 4 +- ...mmit-id.txt => git-get-tar-commit-id.adoc} | 0 Documentation/{git-grep.txt => git-grep.adoc} | 4 +- Documentation/{git-gui.txt => git-gui.adoc} | 0 ...t-hash-object.txt => git-hash-object.adoc} | 0 Documentation/{git-help.txt => git-help.adoc} | 0 Documentation/{git-hook.txt => git-hook.adoc} | 0 ...http-backend.txt => git-http-backend.adoc} | 0 ...git-http-fetch.txt => git-http-fetch.adoc} | 0 .../{git-http-push.txt => git-http-push.adoc} | 0 .../{git-imap-send.txt => git-imap-send.adoc} | 4 +- ...git-index-pack.txt => git-index-pack.adoc} | 2 +- .../{git-init-db.txt => git-init-db.adoc} | 0 Documentation/{git-init.txt => git-init.adoc} | 8 +- .../{git-instaweb.txt => git-instaweb.adoc} | 0 ...ailers.txt => git-interpret-trailers.adoc} | 0 Documentation/{git-log.txt => git-log.adoc} | 20 +- .../{git-ls-files.txt => git-ls-files.adoc} | 0 .../{git-ls-remote.txt => git-ls-remote.adoc} | 0 .../{git-ls-tree.txt => git-ls-tree.adoc} | 0 .../{git-mailinfo.txt => git-mailinfo.adoc} | 4 +- .../{git-mailsplit.txt => git-mailsplit.adoc} | 0 ...t-maintenance.txt => git-maintenance.adoc} | 4 +- ...git-merge-base.txt => git-merge-base.adoc} | 0 ...git-merge-file.txt => git-merge-file.adoc} | 0 ...t-merge-index.txt => git-merge-index.adoc} | 0 ...e-one-file.txt => git-merge-one-file.adoc} | 0 ...git-merge-tree.txt => git-merge-tree.adoc} | 0 .../{git-merge.txt => git-merge.adoc} | 10 +- ...etool--lib.txt => git-mergetool--lib.adoc} | 0 .../{git-mergetool.txt => git-mergetool.adoc} | 6 +- .../{git-mktag.txt => git-mktag.adoc} | 0 .../{git-mktree.txt => git-mktree.adoc} | 0 ...ck-index.txt => git-multi-pack-index.adoc} | 0 Documentation/{git-mv.txt => git-mv.adoc} | 0 .../{git-name-rev.txt => git-name-rev.adoc} | 0 .../{git-notes.txt => git-notes.adoc} | 4 +- Documentation/{git-p4.txt => git-p4.adoc} | 0 ...pack-objects.txt => git-pack-objects.adoc} | 0 ...-redundant.txt => git-pack-redundant.adoc} | 0 .../{git-pack-refs.txt => git-pack-refs.adoc} | 0 .../{git-patch-id.txt => git-patch-id.adoc} | 0 ...prune-packed.txt => git-prune-packed.adoc} | 0 .../{git-prune.txt => git-prune.adoc} | 0 Documentation/{git-pull.txt => git-pull.adoc} | 12 +- Documentation/{git-push.txt => git-push.adoc} | 8 +- ...t-quiltimport.txt => git-quiltimport.adoc} | 0 ...git-range-diff.txt => git-range-diff.adoc} | 0 .../{git-read-tree.txt => git-read-tree.adoc} | 0 .../{git-rebase.txt => git-rebase.adoc} | 10 +- ...receive-pack.txt => git-receive-pack.adoc} | 0 .../{git-reflog.txt => git-reflog.adoc} | 0 Documentation/{git-refs.txt => git-refs.adoc} | 2 +- ...git-remote-ext.txt => git-remote-ext.adoc} | 0 .../{git-remote-fd.txt => git-remote-fd.adoc} | 0 ...-helpers.txto => git-remote-helpers.adoco} | 0 .../{git-remote.txt => git-remote.adoc} | 0 .../{git-repack.txt => git-repack.adoc} | 0 .../{git-replace.txt => git-replace.adoc} | 0 .../{git-replay.txt => git-replay.adoc} | 2 +- ...request-pull.txt => git-request-pull.adoc} | 0 .../{git-rerere.txt => git-rerere.adoc} | 0 .../{git-reset.txt => git-reset.adoc} | 0 .../{git-restore.txt => git-restore.adoc} | 0 .../{git-rev-list.txt => git-rev-list.adoc} | 6 +- .../{git-rev-parse.txt => git-rev-parse.adoc} | 2 +- .../{git-revert.txt => git-revert.adoc} | 8 +- Documentation/{git-rm.txt => git-rm.adoc} | 0 ...git-send-email.txt => git-send-email.adoc} | 4 +- .../{git-send-pack.txt => git-send-pack.adoc} | 0 ...nvsubst.txt => git-sh-i18n--envsubst.adoc} | 0 .../{git-sh-i18n.txt => git-sh-i18n.adoc} | 0 .../{git-sh-setup.txt => git-sh-setup.adoc} | 0 .../{git-shell.txt => git-shell.adoc} | 0 .../{git-shortlog.txt => git-shortlog.adoc} | 2 +- ...t-show-branch.txt => git-show-branch.adoc} | 4 +- ...git-show-index.txt => git-show-index.adoc} | 2 +- .../{git-show-ref.txt => git-show-ref.adoc} | 0 Documentation/{git-show.txt => git-show.adoc} | 10 +- ...-checkout.txt => git-sparse-checkout.adoc} | 0 .../{git-stage.txt => git-stage.adoc} | 0 .../{git-stash.txt => git-stash.adoc} | 4 +- .../{git-status.txt => git-status.adoc} | 0 ...git-stripspace.txt => git-stripspace.adoc} | 0 .../{git-submodule.txt => git-submodule.adoc} | 0 Documentation/{git-svn.txt => git-svn.adoc} | 0 .../{git-switch.txt => git-switch.adoc} | 4 +- ...symbolic-ref.txt => git-symbolic-ref.adoc} | 0 Documentation/{git-tag.txt => git-tag.adoc} | 4 +- .../{git-tools.txt => git-tools.adoc} | 0 ...t-unpack-file.txt => git-unpack-file.adoc} | 0 ...ck-objects.txt => git-unpack-objects.adoc} | 0 ...update-index.txt => git-update-index.adoc} | 0 ...git-update-ref.txt => git-update-ref.adoc} | 0 ...r-info.txt => git-update-server-info.adoc} | 0 ...ad-archive.txt => git-upload-archive.adoc} | 0 ...t-upload-pack.txt => git-upload-pack.adoc} | 0 Documentation/{git-var.txt => git-var.adoc} | 0 ...rify-commit.txt => git-verify-commit.adoc} | 0 ...t-verify-pack.txt => git-verify-pack.adoc} | 0 ...git-verify-tag.txt => git-verify-tag.adoc} | 0 .../{git-version.txt => git-version.adoc} | 0 ...t-web--browse.txt => git-web--browse.adoc} | 0 ...t-whatchanged.txt => git-whatchanged.adoc} | 0 .../{git-worktree.txt => git-worktree.adoc} | 0 ...git-write-tree.txt => git-write-tree.adoc} | 0 Documentation/{git.txt => git.adoc} | 24 +- .../{gitattributes.txt => gitattributes.adoc} | 0 Documentation/{gitcli.txt => gitcli.adoc} | 0 ...ore-tutorial.txt => gitcore-tutorial.adoc} | 0 ...gitcredentials.txt => gitcredentials.adoc} | 0 ...vs-migration.txt => gitcvs-migration.adoc} | 0 .../{gitdiffcore.txt => gitdiffcore.adoc} | 0 .../{giteveryday.txt => giteveryday.adoc} | 0 Documentation/{gitfaq.txt => gitfaq.adoc} | 0 ...ormat-bundle.txt => gitformat-bundle.adoc} | 0 ...tformat-chunk.txt => gitformat-chunk.adoc} | 0 ...-graph.txt => gitformat-commit-graph.adoc} | 0 ...tformat-index.txt => gitformat-index.adoc} | 0 ...gitformat-pack.txt => gitformat-pack.adoc} | 0 ...signature.txt => gitformat-signature.adoc} | 0 .../{gitglossary.txt => gitglossary.adoc} | 2 +- Documentation/{githooks.txt => githooks.adoc} | 0 .../{gitignore.txt => gitignore.adoc} | 0 Documentation/{gitk.txt => gitk.adoc} | 2 +- .../{gitmailmap.txt => gitmailmap.adoc} | 0 .../{gitmodules.txt => gitmodules.adoc} | 0 .../{gitnamespaces.txt => gitnamespaces.adoc} | 2 +- .../{gitpacking.txt => gitpacking.adoc} | 2 +- ...ties.txt => gitprotocol-capabilities.adoc} | 0 ...col-common.txt => gitprotocol-common.adoc} | 0 ...rotocol-http.txt => gitprotocol-http.adoc} | 0 ...rotocol-pack.txt => gitprotocol-pack.adoc} | 0 ...gitprotocol-v2.txt => gitprotocol-v2.adoc} | 0 ...ote-helpers.txt => gitremote-helpers.adoc} | 0 ...y-layout.txt => gitrepository-layout.adoc} | 2 +- .../{gitrevisions.txt => gitrevisions.adoc} | 2 +- .../{gitsubmodules.txt => gitsubmodules.adoc} | 0 .../{gittutorial-2.txt => gittutorial-2.adoc} | 0 .../{gittutorial.txt => gittutorial.adoc} | 0 Documentation/{gitweb.txt => gitweb.adoc} | 0 .../{gitweb.conf.txt => gitweb.conf.adoc} | 0 .../{gitworkflows.txt => gitworkflows.adoc} | 0 ...sary-content.txt => glossary-content.adoc} | 0 ...txt => coordinate-embargoed-releases.adoc} | 0 ...xt => keep-canonical-history-correct.adoc} | 0 .../{maintain-git.txt => maintain-git.adoc} | 0 .../{new-command.txt => new-command.adoc} | 0 ...h.txt => rebase-from-internal-branch.adoc} | 0 ...hook.txt => rebuild-from-update-hook.adoc} | 0 ...txt => recover-corrupted-blob-object.adoc} | 0 ...t => recover-corrupted-object-harder.adoc} | 0 ...y-merge.txt => revert-a-faulty-merge.adoc} | 0 ...h-rebase.txt => revert-branch-rebase.adoc} | 0 ...hes.txt => separating-topic-branches.adoc} | 0 ...tp.txt => setup-git-server-over-http.adoc} | 0 ...k-example.txt => update-hook-example.adoc} | 0 ...use-git-daemon.txt => use-git-daemon.adoc} | 0 ...e-subtree.txt => using-merge-subtree.adoc} | 0 ... => using-signed-tag-in-pull-request.adoc} | 0 Documentation/{i18n.txt => i18n.adoc} | 0 ...on-all.txt => cmd-config-section-all.adoc} | 0 ...-rest.txt => cmd-config-section-rest.adoc} | 0 Documentation/install-webdoc.sh | 16 +- ...ange-format.txt => line-range-format.adoc} | 0 ...ge-options.txt => line-range-options.adoc} | 2 +- Documentation/lint-gitlink.perl | 4 +- Documentation/lint-manpages.sh | 6 +- .../{merge-options.txt => merge-options.adoc} | 2 +- ...e-strategies.txt => merge-strategies.adoc} | 0 .../mergetools/{vimdiff.txt => vimdiff.adoc} | 0 Documentation/meson.build | 442 +++++++++--------- ...imer.txt => object-format-disclaimer.adoc} | 0 ...pretty-formats.txt => pretty-formats.adoc} | 0 ...pretty-options.txt => pretty-options.adoc} | 0 ...-fetch-param.txt => pull-fetch-param.adoc} | 0 ...ters.txt => ref-reachability-filters.adoc} | 0 ...age-format.txt => ref-storage-format.adoc} | 0 ...rerere-options.txt => rerere-options.adoc} | 0 ...cription.txt => rev-list-description.adoc} | 0 ...list-options.txt => rev-list-options.adoc} | 2 +- .../{revisions.txt => revisions.adoc} | 0 Documentation/{scalar.txt => scalar.adoc} | 0 .../{sequencer.txt => sequencer.adoc} | 0 ...signoff-option.txt => signoff-option.adoc} | 0 ...r-handling.txt => api-error-handling.adoc} | 0 ...api-index-skel.txt => api-index-skel.adoc} | 0 Documentation/technical/api-index.sh | 8 +- .../{api-merge.txt => api-merge.adoc} | 0 ...rse-options.txt => api-parse-options.adoc} | 0 ...api-simple-ipc.txt => api-simple-ipc.adoc} | 0 .../{api-trace2.txt => api-trace2.adoc} | 2 +- .../{bitmap-format.txt => bitmap-format.adoc} | 0 .../{build-systems.txt => build-systems.adoc} | 0 .../{bundle-uri.txt => bundle-uri.adoc} | 0 .../{commit-graph.txt => commit-graph.adoc} | 0 ...on.txt => directory-rename-detection.adoc} | 0 ...tion.txt => hash-function-transition.adoc} | 0 ...txt => long-running-process-protocol.adoc} | 0 ...i-pack-index.txt => multi-pack-index.adoc} | 0 ...ck-heuristics.txt => pack-heuristics.adoc} | 0 .../{packfile-uri.txt => packfile-uri.adoc} | 0 ...el-checkout.txt => parallel-checkout.adoc} | 0 .../{partial-clone.txt => partial-clone.adoc} | 0 ...form-support.txt => platform-support.adoc} | 0 .../technical/{racy-git.txt => racy-git.adoc} | 0 .../technical/{reftable.txt => reftable.adoc} | 0 ...g-renames.txt => remembering-renames.adoc} | 0 ...ry-version.txt => repository-version.adoc} | 0 .../technical/{rerere.txt => rerere.adoc} | 0 .../technical/{scalar.txt => scalar.adoc} | 0 ...k-pipeline.txt => send-pack-pipeline.adoc} | 0 .../technical/{shallow.txt => shallow.adoc} | 0 ...arse-checkout.txt => sparse-checkout.adoc} | 0 .../{sparse-index.txt => sparse-index.adoc} | 0 .../{trivial-merge.txt => trivial-merge.adoc} | 0 .../{unit-tests.txt => unit-tests.adoc} | 0 ...t-values.txt => trace2-target-values.adoc} | 0 ...ata-leaks.txt => transfer-data-leaks.adoc} | 0 .../{urls-remotes.txt => urls-remotes.adoc} | 2 +- Documentation/{urls.txt => urls.adoc} | 0 .../{user-manual.txt => user-manual.adoc} | 2 +- Makefile | 6 +- RelNotes | 2 +- generate-cmdlist.sh | 2 +- generate-configlist.sh | 2 +- generate-hooklist.sh | 2 +- meson.build | 2 +- 919 files changed, 617 insertions(+), 617 deletions(-) rename Documentation/{BreakingChanges.txt => BreakingChanges.adoc} (100%) rename Documentation/{DecisionMaking.txt => DecisionMaking.adoc} (100%) rename Documentation/{MyFirstContribution.txt => MyFirstContribution.adoc} (100%) rename Documentation/{MyFirstObjectWalk.txt => MyFirstObjectWalk.adoc} (100%) rename Documentation/RelNotes/{1.5.0.1.txt => 1.5.0.1.adoc} (100%) rename Documentation/RelNotes/{1.5.0.2.txt => 1.5.0.2.adoc} (100%) rename Documentation/RelNotes/{1.5.0.3.txt => 1.5.0.3.adoc} (100%) rename Documentation/RelNotes/{1.5.0.4.txt => 1.5.0.4.adoc} (100%) rename Documentation/RelNotes/{1.5.0.5.txt => 1.5.0.5.adoc} (100%) rename Documentation/RelNotes/{1.5.0.6.txt => 1.5.0.6.adoc} (100%) rename Documentation/RelNotes/{1.5.0.7.txt => 1.5.0.7.adoc} (100%) rename Documentation/RelNotes/{1.5.0.txt => 1.5.0.adoc} (100%) rename Documentation/RelNotes/{1.5.1.1.txt => 1.5.1.1.adoc} (100%) rename Documentation/RelNotes/{1.5.1.2.txt => 1.5.1.2.adoc} (100%) rename Documentation/RelNotes/{1.5.1.3.txt => 1.5.1.3.adoc} (100%) rename Documentation/RelNotes/{1.5.1.4.txt => 1.5.1.4.adoc} (100%) rename Documentation/RelNotes/{1.5.1.5.txt => 1.5.1.5.adoc} (100%) rename Documentation/RelNotes/{1.5.1.6.txt => 1.5.1.6.adoc} (100%) rename Documentation/RelNotes/{1.5.1.txt => 1.5.1.adoc} (100%) rename Documentation/RelNotes/{1.5.2.1.txt => 1.5.2.1.adoc} (100%) rename Documentation/RelNotes/{1.5.2.2.txt => 1.5.2.2.adoc} (100%) rename Documentation/RelNotes/{1.5.2.3.txt => 1.5.2.3.adoc} (100%) rename Documentation/RelNotes/{1.5.2.4.txt => 1.5.2.4.adoc} (100%) rename Documentation/RelNotes/{1.5.2.5.txt => 1.5.2.5.adoc} (100%) rename Documentation/RelNotes/{1.5.2.txt => 1.5.2.adoc} (100%) rename Documentation/RelNotes/{1.5.3.1.txt => 1.5.3.1.adoc} (100%) rename Documentation/RelNotes/{1.5.3.2.txt => 1.5.3.2.adoc} (100%) rename Documentation/RelNotes/{1.5.3.3.txt => 1.5.3.3.adoc} (100%) rename Documentation/RelNotes/{1.5.3.4.txt => 1.5.3.4.adoc} (100%) rename Documentation/RelNotes/{1.5.3.5.txt => 1.5.3.5.adoc} (100%) rename Documentation/RelNotes/{1.5.3.6.txt => 1.5.3.6.adoc} (100%) rename Documentation/RelNotes/{1.5.3.7.txt => 1.5.3.7.adoc} (100%) rename Documentation/RelNotes/{1.5.3.8.txt => 1.5.3.8.adoc} (100%) rename Documentation/RelNotes/{1.5.3.txt => 1.5.3.adoc} (100%) rename Documentation/RelNotes/{1.5.4.1.txt => 1.5.4.1.adoc} (100%) rename Documentation/RelNotes/{1.5.4.2.txt => 1.5.4.2.adoc} (100%) rename Documentation/RelNotes/{1.5.4.3.txt => 1.5.4.3.adoc} (100%) rename Documentation/RelNotes/{1.5.4.4.txt => 1.5.4.4.adoc} (100%) rename Documentation/RelNotes/{1.5.4.5.txt => 1.5.4.5.adoc} (100%) rename Documentation/RelNotes/{1.5.4.6.txt => 1.5.4.6.adoc} (100%) rename Documentation/RelNotes/{1.5.4.7.txt => 1.5.4.7.adoc} (100%) rename Documentation/RelNotes/{1.5.4.txt => 1.5.4.adoc} (100%) rename Documentation/RelNotes/{1.5.5.1.txt => 1.5.5.1.adoc} (100%) rename Documentation/RelNotes/{1.5.5.2.txt => 1.5.5.2.adoc} (100%) rename Documentation/RelNotes/{1.5.5.3.txt => 1.5.5.3.adoc} (100%) rename Documentation/RelNotes/{1.5.5.4.txt => 1.5.5.4.adoc} (100%) rename Documentation/RelNotes/{1.5.5.5.txt => 1.5.5.5.adoc} (100%) rename Documentation/RelNotes/{1.5.5.6.txt => 1.5.5.6.adoc} (100%) rename Documentation/RelNotes/{1.5.5.txt => 1.5.5.adoc} (100%) rename Documentation/RelNotes/{1.5.6.1.txt => 1.5.6.1.adoc} (100%) rename Documentation/RelNotes/{1.5.6.2.txt => 1.5.6.2.adoc} (100%) rename Documentation/RelNotes/{1.5.6.3.txt => 1.5.6.3.adoc} (100%) rename Documentation/RelNotes/{1.5.6.4.txt => 1.5.6.4.adoc} (100%) rename Documentation/RelNotes/{1.5.6.5.txt => 1.5.6.5.adoc} (100%) rename Documentation/RelNotes/{1.5.6.6.txt => 1.5.6.6.adoc} (100%) rename Documentation/RelNotes/{1.5.6.txt => 1.5.6.adoc} (100%) rename Documentation/RelNotes/{1.6.0.1.txt => 1.6.0.1.adoc} (100%) rename Documentation/RelNotes/{1.6.0.2.txt => 1.6.0.2.adoc} (100%) rename Documentation/RelNotes/{1.6.0.3.txt => 1.6.0.3.adoc} (100%) rename Documentation/RelNotes/{1.6.0.4.txt => 1.6.0.4.adoc} (100%) rename Documentation/RelNotes/{1.6.0.5.txt => 1.6.0.5.adoc} (100%) rename Documentation/RelNotes/{1.6.0.6.txt => 1.6.0.6.adoc} (100%) rename Documentation/RelNotes/{1.6.0.txt => 1.6.0.adoc} (100%) rename Documentation/RelNotes/{1.6.1.1.txt => 1.6.1.1.adoc} (100%) rename Documentation/RelNotes/{1.6.1.2.txt => 1.6.1.2.adoc} (100%) rename Documentation/RelNotes/{1.6.1.3.txt => 1.6.1.3.adoc} (100%) rename Documentation/RelNotes/{1.6.1.4.txt => 1.6.1.4.adoc} (100%) rename Documentation/RelNotes/{1.6.1.txt => 1.6.1.adoc} (100%) rename Documentation/RelNotes/{1.6.2.1.txt => 1.6.2.1.adoc} (100%) rename Documentation/RelNotes/{1.6.2.2.txt => 1.6.2.2.adoc} (100%) rename Documentation/RelNotes/{1.6.2.3.txt => 1.6.2.3.adoc} (100%) rename Documentation/RelNotes/{1.6.2.4.txt => 1.6.2.4.adoc} (100%) rename Documentation/RelNotes/{1.6.2.5.txt => 1.6.2.5.adoc} (100%) rename Documentation/RelNotes/{1.6.2.txt => 1.6.2.adoc} (100%) rename Documentation/RelNotes/{1.6.3.1.txt => 1.6.3.1.adoc} (100%) rename Documentation/RelNotes/{1.6.3.2.txt => 1.6.3.2.adoc} (100%) rename Documentation/RelNotes/{1.6.3.3.txt => 1.6.3.3.adoc} (100%) rename Documentation/RelNotes/{1.6.3.4.txt => 1.6.3.4.adoc} (100%) rename Documentation/RelNotes/{1.6.3.txt => 1.6.3.adoc} (100%) rename Documentation/RelNotes/{1.6.4.1.txt => 1.6.4.1.adoc} (100%) rename Documentation/RelNotes/{1.6.4.2.txt => 1.6.4.2.adoc} (100%) rename Documentation/RelNotes/{1.6.4.3.txt => 1.6.4.3.adoc} (100%) rename Documentation/RelNotes/{1.6.4.4.txt => 1.6.4.4.adoc} (100%) rename Documentation/RelNotes/{1.6.4.5.txt => 1.6.4.5.adoc} (100%) rename Documentation/RelNotes/{1.6.4.txt => 1.6.4.adoc} (100%) rename Documentation/RelNotes/{1.6.5.1.txt => 1.6.5.1.adoc} (100%) rename Documentation/RelNotes/{1.6.5.2.txt => 1.6.5.2.adoc} (100%) rename Documentation/RelNotes/{1.6.5.3.txt => 1.6.5.3.adoc} (100%) rename Documentation/RelNotes/{1.6.5.4.txt => 1.6.5.4.adoc} (100%) rename Documentation/RelNotes/{1.6.5.5.txt => 1.6.5.5.adoc} (100%) rename Documentation/RelNotes/{1.6.5.6.txt => 1.6.5.6.adoc} (100%) rename Documentation/RelNotes/{1.6.5.7.txt => 1.6.5.7.adoc} (100%) rename Documentation/RelNotes/{1.6.5.8.txt => 1.6.5.8.adoc} (100%) rename Documentation/RelNotes/{1.6.5.9.txt => 1.6.5.9.adoc} (100%) rename Documentation/RelNotes/{1.6.5.txt => 1.6.5.adoc} (100%) rename Documentation/RelNotes/{1.6.6.1.txt => 1.6.6.1.adoc} (100%) rename Documentation/RelNotes/{1.6.6.2.txt => 1.6.6.2.adoc} (100%) rename Documentation/RelNotes/{1.6.6.3.txt => 1.6.6.3.adoc} (100%) rename Documentation/RelNotes/{1.6.6.txt => 1.6.6.adoc} (100%) rename Documentation/RelNotes/{1.7.0.1.txt => 1.7.0.1.adoc} (100%) rename Documentation/RelNotes/{1.7.0.2.txt => 1.7.0.2.adoc} (100%) rename Documentation/RelNotes/{1.7.0.3.txt => 1.7.0.3.adoc} (100%) rename Documentation/RelNotes/{1.7.0.4.txt => 1.7.0.4.adoc} (100%) rename Documentation/RelNotes/{1.7.0.5.txt => 1.7.0.5.adoc} (100%) rename Documentation/RelNotes/{1.7.0.6.txt => 1.7.0.6.adoc} (100%) rename Documentation/RelNotes/{1.7.0.7.txt => 1.7.0.7.adoc} (100%) rename Documentation/RelNotes/{1.7.0.8.txt => 1.7.0.8.adoc} (100%) rename Documentation/RelNotes/{1.7.0.9.txt => 1.7.0.9.adoc} (100%) rename Documentation/RelNotes/{1.7.0.txt => 1.7.0.adoc} (100%) rename Documentation/RelNotes/{1.7.1.1.txt => 1.7.1.1.adoc} (100%) rename Documentation/RelNotes/{1.7.1.2.txt => 1.7.1.2.adoc} (100%) rename Documentation/RelNotes/{1.7.1.3.txt => 1.7.1.3.adoc} (100%) rename Documentation/RelNotes/{1.7.1.4.txt => 1.7.1.4.adoc} (100%) rename Documentation/RelNotes/{1.7.1.txt => 1.7.1.adoc} (100%) rename Documentation/RelNotes/{1.7.10.1.txt => 1.7.10.1.adoc} (100%) rename Documentation/RelNotes/{1.7.10.2.txt => 1.7.10.2.adoc} (100%) rename Documentation/RelNotes/{1.7.10.3.txt => 1.7.10.3.adoc} (100%) rename Documentation/RelNotes/{1.7.10.4.txt => 1.7.10.4.adoc} (100%) rename Documentation/RelNotes/{1.7.10.5.txt => 1.7.10.5.adoc} (100%) rename Documentation/RelNotes/{1.7.10.txt => 1.7.10.adoc} (100%) rename Documentation/RelNotes/{1.7.11.1.txt => 1.7.11.1.adoc} (100%) rename Documentation/RelNotes/{1.7.11.2.txt => 1.7.11.2.adoc} (100%) rename Documentation/RelNotes/{1.7.11.3.txt => 1.7.11.3.adoc} (100%) rename Documentation/RelNotes/{1.7.11.4.txt => 1.7.11.4.adoc} (100%) rename Documentation/RelNotes/{1.7.11.5.txt => 1.7.11.5.adoc} (100%) rename Documentation/RelNotes/{1.7.11.6.txt => 1.7.11.6.adoc} (100%) rename Documentation/RelNotes/{1.7.11.7.txt => 1.7.11.7.adoc} (100%) rename Documentation/RelNotes/{1.7.11.txt => 1.7.11.adoc} (100%) rename Documentation/RelNotes/{1.7.12.1.txt => 1.7.12.1.adoc} (100%) rename Documentation/RelNotes/{1.7.12.2.txt => 1.7.12.2.adoc} (100%) rename Documentation/RelNotes/{1.7.12.3.txt => 1.7.12.3.adoc} (100%) rename Documentation/RelNotes/{1.7.12.4.txt => 1.7.12.4.adoc} (100%) rename Documentation/RelNotes/{1.7.12.txt => 1.7.12.adoc} (100%) rename Documentation/RelNotes/{1.7.2.1.txt => 1.7.2.1.adoc} (100%) rename Documentation/RelNotes/{1.7.2.2.txt => 1.7.2.2.adoc} (100%) rename Documentation/RelNotes/{1.7.2.3.txt => 1.7.2.3.adoc} (100%) rename Documentation/RelNotes/{1.7.2.4.txt => 1.7.2.4.adoc} (100%) rename Documentation/RelNotes/{1.7.2.5.txt => 1.7.2.5.adoc} (100%) rename Documentation/RelNotes/{1.7.2.txt => 1.7.2.adoc} (100%) rename Documentation/RelNotes/{1.7.3.1.txt => 1.7.3.1.adoc} (100%) rename Documentation/RelNotes/{1.7.3.2.txt => 1.7.3.2.adoc} (100%) rename Documentation/RelNotes/{1.7.3.3.txt => 1.7.3.3.adoc} (100%) rename Documentation/RelNotes/{1.7.3.4.txt => 1.7.3.4.adoc} (100%) rename Documentation/RelNotes/{1.7.3.5.txt => 1.7.3.5.adoc} (100%) rename Documentation/RelNotes/{1.7.3.txt => 1.7.3.adoc} (100%) rename Documentation/RelNotes/{1.7.4.1.txt => 1.7.4.1.adoc} (100%) rename Documentation/RelNotes/{1.7.4.2.txt => 1.7.4.2.adoc} (100%) rename Documentation/RelNotes/{1.7.4.3.txt => 1.7.4.3.adoc} (100%) rename Documentation/RelNotes/{1.7.4.4.txt => 1.7.4.4.adoc} (100%) rename Documentation/RelNotes/{1.7.4.5.txt => 1.7.4.5.adoc} (100%) rename Documentation/RelNotes/{1.7.4.txt => 1.7.4.adoc} (100%) rename Documentation/RelNotes/{1.7.5.1.txt => 1.7.5.1.adoc} (100%) rename Documentation/RelNotes/{1.7.5.2.txt => 1.7.5.2.adoc} (100%) rename Documentation/RelNotes/{1.7.5.3.txt => 1.7.5.3.adoc} (100%) rename Documentation/RelNotes/{1.7.5.4.txt => 1.7.5.4.adoc} (100%) rename Documentation/RelNotes/{1.7.5.txt => 1.7.5.adoc} (100%) rename Documentation/RelNotes/{1.7.6.1.txt => 1.7.6.1.adoc} (100%) rename Documentation/RelNotes/{1.7.6.2.txt => 1.7.6.2.adoc} (100%) rename Documentation/RelNotes/{1.7.6.3.txt => 1.7.6.3.adoc} (100%) rename Documentation/RelNotes/{1.7.6.4.txt => 1.7.6.4.adoc} (100%) rename Documentation/RelNotes/{1.7.6.5.txt => 1.7.6.5.adoc} (100%) rename Documentation/RelNotes/{1.7.6.6.txt => 1.7.6.6.adoc} (100%) rename Documentation/RelNotes/{1.7.6.txt => 1.7.6.adoc} (100%) rename Documentation/RelNotes/{1.7.7.1.txt => 1.7.7.1.adoc} (100%) rename Documentation/RelNotes/{1.7.7.2.txt => 1.7.7.2.adoc} (100%) rename Documentation/RelNotes/{1.7.7.3.txt => 1.7.7.3.adoc} (100%) rename Documentation/RelNotes/{1.7.7.4.txt => 1.7.7.4.adoc} (100%) rename Documentation/RelNotes/{1.7.7.5.txt => 1.7.7.5.adoc} (100%) rename Documentation/RelNotes/{1.7.7.6.txt => 1.7.7.6.adoc} (100%) rename Documentation/RelNotes/{1.7.7.7.txt => 1.7.7.7.adoc} (100%) rename Documentation/RelNotes/{1.7.7.txt => 1.7.7.adoc} (100%) rename Documentation/RelNotes/{1.7.8.1.txt => 1.7.8.1.adoc} (100%) rename Documentation/RelNotes/{1.7.8.2.txt => 1.7.8.2.adoc} (100%) rename Documentation/RelNotes/{1.7.8.3.txt => 1.7.8.3.adoc} (100%) rename Documentation/RelNotes/{1.7.8.4.txt => 1.7.8.4.adoc} (100%) rename Documentation/RelNotes/{1.7.8.5.txt => 1.7.8.5.adoc} (100%) rename Documentation/RelNotes/{1.7.8.6.txt => 1.7.8.6.adoc} (100%) rename Documentation/RelNotes/{1.7.8.txt => 1.7.8.adoc} (100%) rename Documentation/RelNotes/{1.7.9.1.txt => 1.7.9.1.adoc} (100%) rename Documentation/RelNotes/{1.7.9.2.txt => 1.7.9.2.adoc} (100%) rename Documentation/RelNotes/{1.7.9.3.txt => 1.7.9.3.adoc} (100%) rename Documentation/RelNotes/{1.7.9.4.txt => 1.7.9.4.adoc} (100%) rename Documentation/RelNotes/{1.7.9.5.txt => 1.7.9.5.adoc} (100%) rename Documentation/RelNotes/{1.7.9.6.txt => 1.7.9.6.adoc} (100%) rename Documentation/RelNotes/{1.7.9.7.txt => 1.7.9.7.adoc} (100%) rename Documentation/RelNotes/{1.7.9.txt => 1.7.9.adoc} (100%) rename Documentation/RelNotes/{1.8.0.1.txt => 1.8.0.1.adoc} (100%) rename Documentation/RelNotes/{1.8.0.2.txt => 1.8.0.2.adoc} (100%) rename Documentation/RelNotes/{1.8.0.3.txt => 1.8.0.3.adoc} (100%) rename Documentation/RelNotes/{1.8.0.txt => 1.8.0.adoc} (100%) rename Documentation/RelNotes/{1.8.1.1.txt => 1.8.1.1.adoc} (100%) rename Documentation/RelNotes/{1.8.1.2.txt => 1.8.1.2.adoc} (100%) rename Documentation/RelNotes/{1.8.1.3.txt => 1.8.1.3.adoc} (100%) rename Documentation/RelNotes/{1.8.1.4.txt => 1.8.1.4.adoc} (100%) rename Documentation/RelNotes/{1.8.1.5.txt => 1.8.1.5.adoc} (100%) rename Documentation/RelNotes/{1.8.1.6.txt => 1.8.1.6.adoc} (100%) rename Documentation/RelNotes/{1.8.1.txt => 1.8.1.adoc} (100%) rename Documentation/RelNotes/{1.8.2.1.txt => 1.8.2.1.adoc} (100%) rename Documentation/RelNotes/{1.8.2.2.txt => 1.8.2.2.adoc} (100%) rename Documentation/RelNotes/{1.8.2.3.txt => 1.8.2.3.adoc} (100%) rename Documentation/RelNotes/{1.8.2.txt => 1.8.2.adoc} (100%) rename Documentation/RelNotes/{1.8.3.1.txt => 1.8.3.1.adoc} (100%) rename Documentation/RelNotes/{1.8.3.2.txt => 1.8.3.2.adoc} (100%) rename Documentation/RelNotes/{1.8.3.3.txt => 1.8.3.3.adoc} (100%) rename Documentation/RelNotes/{1.8.3.4.txt => 1.8.3.4.adoc} (100%) rename Documentation/RelNotes/{1.8.3.txt => 1.8.3.adoc} (100%) rename Documentation/RelNotes/{1.8.4.1.txt => 1.8.4.1.adoc} (100%) rename Documentation/RelNotes/{1.8.4.2.txt => 1.8.4.2.adoc} (100%) rename Documentation/RelNotes/{1.8.4.3.txt => 1.8.4.3.adoc} (100%) rename Documentation/RelNotes/{1.8.4.4.txt => 1.8.4.4.adoc} (100%) rename Documentation/RelNotes/{1.8.4.5.txt => 1.8.4.5.adoc} (100%) rename Documentation/RelNotes/{1.8.4.txt => 1.8.4.adoc} (100%) rename Documentation/RelNotes/{1.8.5.1.txt => 1.8.5.1.adoc} (100%) rename Documentation/RelNotes/{1.8.5.2.txt => 1.8.5.2.adoc} (100%) rename Documentation/RelNotes/{1.8.5.3.txt => 1.8.5.3.adoc} (100%) rename Documentation/RelNotes/{1.8.5.4.txt => 1.8.5.4.adoc} (100%) rename Documentation/RelNotes/{1.8.5.5.txt => 1.8.5.5.adoc} (100%) rename Documentation/RelNotes/{1.8.5.6.txt => 1.8.5.6.adoc} (100%) rename Documentation/RelNotes/{1.8.5.txt => 1.8.5.adoc} (100%) rename Documentation/RelNotes/{1.9.0.txt => 1.9.0.adoc} (100%) rename Documentation/RelNotes/{1.9.1.txt => 1.9.1.adoc} (100%) rename Documentation/RelNotes/{1.9.2.txt => 1.9.2.adoc} (100%) rename Documentation/RelNotes/{1.9.3.txt => 1.9.3.adoc} (100%) rename Documentation/RelNotes/{1.9.4.txt => 1.9.4.adoc} (100%) rename Documentation/RelNotes/{1.9.5.txt => 1.9.5.adoc} (100%) rename Documentation/RelNotes/{2.0.0.txt => 2.0.0.adoc} (100%) rename Documentation/RelNotes/{2.0.1.txt => 2.0.1.adoc} (100%) rename Documentation/RelNotes/{2.0.2.txt => 2.0.2.adoc} (100%) rename Documentation/RelNotes/{2.0.3.txt => 2.0.3.adoc} (100%) rename Documentation/RelNotes/{2.0.4.txt => 2.0.4.adoc} (100%) rename Documentation/RelNotes/{2.0.5.txt => 2.0.5.adoc} (100%) rename Documentation/RelNotes/{2.1.0.txt => 2.1.0.adoc} (100%) rename Documentation/RelNotes/{2.1.1.txt => 2.1.1.adoc} (100%) rename Documentation/RelNotes/{2.1.2.txt => 2.1.2.adoc} (100%) rename Documentation/RelNotes/{2.1.3.txt => 2.1.3.adoc} (100%) rename Documentation/RelNotes/{2.1.4.txt => 2.1.4.adoc} (100%) rename Documentation/RelNotes/{2.10.0.txt => 2.10.0.adoc} (100%) rename Documentation/RelNotes/{2.10.1.txt => 2.10.1.adoc} (100%) rename Documentation/RelNotes/{2.10.2.txt => 2.10.2.adoc} (100%) rename Documentation/RelNotes/{2.10.3.txt => 2.10.3.adoc} (100%) rename Documentation/RelNotes/{2.10.4.txt => 2.10.4.adoc} (100%) rename Documentation/RelNotes/{2.10.5.txt => 2.10.5.adoc} (100%) rename Documentation/RelNotes/{2.11.0.txt => 2.11.0.adoc} (100%) rename Documentation/RelNotes/{2.11.1.txt => 2.11.1.adoc} (100%) rename Documentation/RelNotes/{2.11.2.txt => 2.11.2.adoc} (100%) rename Documentation/RelNotes/{2.11.3.txt => 2.11.3.adoc} (100%) rename Documentation/RelNotes/{2.11.4.txt => 2.11.4.adoc} (100%) rename Documentation/RelNotes/{2.12.0.txt => 2.12.0.adoc} (100%) rename Documentation/RelNotes/{2.12.1.txt => 2.12.1.adoc} (100%) rename Documentation/RelNotes/{2.12.2.txt => 2.12.2.adoc} (100%) rename Documentation/RelNotes/{2.12.3.txt => 2.12.3.adoc} (100%) rename Documentation/RelNotes/{2.12.4.txt => 2.12.4.adoc} (100%) rename Documentation/RelNotes/{2.12.5.txt => 2.12.5.adoc} (100%) rename Documentation/RelNotes/{2.13.0.txt => 2.13.0.adoc} (100%) rename Documentation/RelNotes/{2.13.1.txt => 2.13.1.adoc} (100%) rename Documentation/RelNotes/{2.13.2.txt => 2.13.2.adoc} (100%) rename Documentation/RelNotes/{2.13.3.txt => 2.13.3.adoc} (100%) rename Documentation/RelNotes/{2.13.4.txt => 2.13.4.adoc} (100%) rename Documentation/RelNotes/{2.13.5.txt => 2.13.5.adoc} (100%) rename Documentation/RelNotes/{2.13.6.txt => 2.13.6.adoc} (100%) rename Documentation/RelNotes/{2.13.7.txt => 2.13.7.adoc} (100%) rename Documentation/RelNotes/{2.14.0.txt => 2.14.0.adoc} (100%) rename Documentation/RelNotes/{2.14.1.txt => 2.14.1.adoc} (100%) rename Documentation/RelNotes/{2.14.2.txt => 2.14.2.adoc} (100%) rename Documentation/RelNotes/{2.14.3.txt => 2.14.3.adoc} (100%) rename Documentation/RelNotes/{2.14.4.txt => 2.14.4.adoc} (100%) rename Documentation/RelNotes/{2.14.5.txt => 2.14.5.adoc} (100%) rename Documentation/RelNotes/{2.14.6.txt => 2.14.6.adoc} (100%) rename Documentation/RelNotes/{2.15.0.txt => 2.15.0.adoc} (100%) rename Documentation/RelNotes/{2.15.1.txt => 2.15.1.adoc} (100%) rename Documentation/RelNotes/{2.15.2.txt => 2.15.2.adoc} (100%) rename Documentation/RelNotes/{2.15.3.txt => 2.15.3.adoc} (100%) rename Documentation/RelNotes/{2.15.4.txt => 2.15.4.adoc} (100%) rename Documentation/RelNotes/{2.16.0.txt => 2.16.0.adoc} (100%) rename Documentation/RelNotes/{2.16.1.txt => 2.16.1.adoc} (100%) rename Documentation/RelNotes/{2.16.2.txt => 2.16.2.adoc} (100%) rename Documentation/RelNotes/{2.16.3.txt => 2.16.3.adoc} (100%) rename Documentation/RelNotes/{2.16.4.txt => 2.16.4.adoc} (100%) rename Documentation/RelNotes/{2.16.5.txt => 2.16.5.adoc} (100%) rename Documentation/RelNotes/{2.16.6.txt => 2.16.6.adoc} (100%) rename Documentation/RelNotes/{2.17.0.txt => 2.17.0.adoc} (100%) rename Documentation/RelNotes/{2.17.1.txt => 2.17.1.adoc} (100%) rename Documentation/RelNotes/{2.17.2.txt => 2.17.2.adoc} (100%) rename Documentation/RelNotes/{2.17.3.txt => 2.17.3.adoc} (100%) rename Documentation/RelNotes/{2.17.4.txt => 2.17.4.adoc} (100%) rename Documentation/RelNotes/{2.17.5.txt => 2.17.5.adoc} (100%) rename Documentation/RelNotes/{2.17.6.txt => 2.17.6.adoc} (100%) rename Documentation/RelNotes/{2.18.0.txt => 2.18.0.adoc} (100%) rename Documentation/RelNotes/{2.18.1.txt => 2.18.1.adoc} (100%) rename Documentation/RelNotes/{2.18.2.txt => 2.18.2.adoc} (100%) rename Documentation/RelNotes/{2.18.3.txt => 2.18.3.adoc} (100%) rename Documentation/RelNotes/{2.18.4.txt => 2.18.4.adoc} (100%) rename Documentation/RelNotes/{2.18.5.txt => 2.18.5.adoc} (100%) rename Documentation/RelNotes/{2.19.0.txt => 2.19.0.adoc} (100%) rename Documentation/RelNotes/{2.19.1.txt => 2.19.1.adoc} (100%) rename Documentation/RelNotes/{2.19.2.txt => 2.19.2.adoc} (100%) rename Documentation/RelNotes/{2.19.3.txt => 2.19.3.adoc} (100%) rename Documentation/RelNotes/{2.19.4.txt => 2.19.4.adoc} (100%) rename Documentation/RelNotes/{2.19.5.txt => 2.19.5.adoc} (100%) rename Documentation/RelNotes/{2.19.6.txt => 2.19.6.adoc} (100%) rename Documentation/RelNotes/{2.2.0.txt => 2.2.0.adoc} (100%) rename Documentation/RelNotes/{2.2.1.txt => 2.2.1.adoc} (100%) rename Documentation/RelNotes/{2.2.2.txt => 2.2.2.adoc} (100%) rename Documentation/RelNotes/{2.2.3.txt => 2.2.3.adoc} (100%) rename Documentation/RelNotes/{2.20.0.txt => 2.20.0.adoc} (100%) rename Documentation/RelNotes/{2.20.1.txt => 2.20.1.adoc} (100%) rename Documentation/RelNotes/{2.20.2.txt => 2.20.2.adoc} (100%) rename Documentation/RelNotes/{2.20.3.txt => 2.20.3.adoc} (100%) rename Documentation/RelNotes/{2.20.4.txt => 2.20.4.adoc} (100%) rename Documentation/RelNotes/{2.20.5.txt => 2.20.5.adoc} (100%) rename Documentation/RelNotes/{2.21.0.txt => 2.21.0.adoc} (100%) rename Documentation/RelNotes/{2.21.1.txt => 2.21.1.adoc} (100%) rename Documentation/RelNotes/{2.21.2.txt => 2.21.2.adoc} (100%) rename Documentation/RelNotes/{2.21.3.txt => 2.21.3.adoc} (100%) rename Documentation/RelNotes/{2.21.4.txt => 2.21.4.adoc} (100%) rename Documentation/RelNotes/{2.22.0.txt => 2.22.0.adoc} (100%) rename Documentation/RelNotes/{2.22.1.txt => 2.22.1.adoc} (100%) rename Documentation/RelNotes/{2.22.2.txt => 2.22.2.adoc} (100%) rename Documentation/RelNotes/{2.22.3.txt => 2.22.3.adoc} (100%) rename Documentation/RelNotes/{2.22.4.txt => 2.22.4.adoc} (100%) rename Documentation/RelNotes/{2.22.5.txt => 2.22.5.adoc} (100%) rename Documentation/RelNotes/{2.23.0.txt => 2.23.0.adoc} (100%) rename Documentation/RelNotes/{2.23.1.txt => 2.23.1.adoc} (100%) rename Documentation/RelNotes/{2.23.2.txt => 2.23.2.adoc} (100%) rename Documentation/RelNotes/{2.23.3.txt => 2.23.3.adoc} (100%) rename Documentation/RelNotes/{2.23.4.txt => 2.23.4.adoc} (100%) rename Documentation/RelNotes/{2.24.0.txt => 2.24.0.adoc} (100%) rename Documentation/RelNotes/{2.24.1.txt => 2.24.1.adoc} (100%) rename Documentation/RelNotes/{2.24.2.txt => 2.24.2.adoc} (100%) rename Documentation/RelNotes/{2.24.3.txt => 2.24.3.adoc} (100%) rename Documentation/RelNotes/{2.24.4.txt => 2.24.4.adoc} (100%) rename Documentation/RelNotes/{2.25.0.txt => 2.25.0.adoc} (100%) rename Documentation/RelNotes/{2.25.1.txt => 2.25.1.adoc} (100%) rename Documentation/RelNotes/{2.25.2.txt => 2.25.2.adoc} (100%) rename Documentation/RelNotes/{2.25.3.txt => 2.25.3.adoc} (100%) rename Documentation/RelNotes/{2.25.4.txt => 2.25.4.adoc} (100%) rename Documentation/RelNotes/{2.25.5.txt => 2.25.5.adoc} (100%) rename Documentation/RelNotes/{2.26.0.txt => 2.26.0.adoc} (100%) rename Documentation/RelNotes/{2.26.1.txt => 2.26.1.adoc} (100%) rename Documentation/RelNotes/{2.26.2.txt => 2.26.2.adoc} (100%) rename Documentation/RelNotes/{2.26.3.txt => 2.26.3.adoc} (100%) rename Documentation/RelNotes/{2.27.0.txt => 2.27.0.adoc} (100%) rename Documentation/RelNotes/{2.27.1.txt => 2.27.1.adoc} (100%) rename Documentation/RelNotes/{2.28.0.txt => 2.28.0.adoc} (100%) rename Documentation/RelNotes/{2.28.1.txt => 2.28.1.adoc} (100%) rename Documentation/RelNotes/{2.29.0.txt => 2.29.0.adoc} (100%) rename Documentation/RelNotes/{2.29.1.txt => 2.29.1.adoc} (100%) rename Documentation/RelNotes/{2.29.2.txt => 2.29.2.adoc} (100%) rename Documentation/RelNotes/{2.29.3.txt => 2.29.3.adoc} (100%) rename Documentation/RelNotes/{2.3.0.txt => 2.3.0.adoc} (100%) rename Documentation/RelNotes/{2.3.1.txt => 2.3.1.adoc} (100%) rename Documentation/RelNotes/{2.3.10.txt => 2.3.10.adoc} (100%) rename Documentation/RelNotes/{2.3.2.txt => 2.3.2.adoc} (100%) rename Documentation/RelNotes/{2.3.3.txt => 2.3.3.adoc} (100%) rename Documentation/RelNotes/{2.3.4.txt => 2.3.4.adoc} (100%) rename Documentation/RelNotes/{2.3.5.txt => 2.3.5.adoc} (100%) rename Documentation/RelNotes/{2.3.6.txt => 2.3.6.adoc} (100%) rename Documentation/RelNotes/{2.3.7.txt => 2.3.7.adoc} (100%) rename Documentation/RelNotes/{2.3.8.txt => 2.3.8.adoc} (100%) rename Documentation/RelNotes/{2.3.9.txt => 2.3.9.adoc} (100%) rename Documentation/RelNotes/{2.30.0.txt => 2.30.0.adoc} (100%) rename Documentation/RelNotes/{2.30.1.txt => 2.30.1.adoc} (100%) rename Documentation/RelNotes/{2.30.2.txt => 2.30.2.adoc} (100%) rename Documentation/RelNotes/{2.30.3.txt => 2.30.3.adoc} (100%) rename Documentation/RelNotes/{2.30.4.txt => 2.30.4.adoc} (100%) rename Documentation/RelNotes/{2.30.5.txt => 2.30.5.adoc} (100%) rename Documentation/RelNotes/{2.30.6.txt => 2.30.6.adoc} (100%) rename Documentation/RelNotes/{2.30.7.txt => 2.30.7.adoc} (100%) rename Documentation/RelNotes/{2.30.8.txt => 2.30.8.adoc} (100%) rename Documentation/RelNotes/{2.30.9.txt => 2.30.9.adoc} (100%) rename Documentation/RelNotes/{2.31.0.txt => 2.31.0.adoc} (100%) rename Documentation/RelNotes/{2.31.1.txt => 2.31.1.adoc} (100%) rename Documentation/RelNotes/{2.31.2.txt => 2.31.2.adoc} (100%) rename Documentation/RelNotes/{2.31.3.txt => 2.31.3.adoc} (100%) rename Documentation/RelNotes/{2.31.4.txt => 2.31.4.adoc} (100%) rename Documentation/RelNotes/{2.31.5.txt => 2.31.5.adoc} (100%) rename Documentation/RelNotes/{2.31.6.txt => 2.31.6.adoc} (100%) rename Documentation/RelNotes/{2.31.7.txt => 2.31.7.adoc} (100%) rename Documentation/RelNotes/{2.31.8.txt => 2.31.8.adoc} (100%) rename Documentation/RelNotes/{2.32.0.txt => 2.32.0.adoc} (100%) rename Documentation/RelNotes/{2.32.1.txt => 2.32.1.adoc} (100%) rename Documentation/RelNotes/{2.32.2.txt => 2.32.2.adoc} (100%) rename Documentation/RelNotes/{2.32.3.txt => 2.32.3.adoc} (100%) rename Documentation/RelNotes/{2.32.4.txt => 2.32.4.adoc} (100%) rename Documentation/RelNotes/{2.32.5.txt => 2.32.5.adoc} (100%) rename Documentation/RelNotes/{2.32.6.txt => 2.32.6.adoc} (100%) rename Documentation/RelNotes/{2.32.7.txt => 2.32.7.adoc} (100%) rename Documentation/RelNotes/{2.33.0.txt => 2.33.0.adoc} (100%) rename Documentation/RelNotes/{2.33.1.txt => 2.33.1.adoc} (100%) rename Documentation/RelNotes/{2.33.2.txt => 2.33.2.adoc} (100%) rename Documentation/RelNotes/{2.33.3.txt => 2.33.3.adoc} (100%) rename Documentation/RelNotes/{2.33.4.txt => 2.33.4.adoc} (100%) rename Documentation/RelNotes/{2.33.5.txt => 2.33.5.adoc} (100%) rename Documentation/RelNotes/{2.33.6.txt => 2.33.6.adoc} (100%) rename Documentation/RelNotes/{2.33.7.txt => 2.33.7.adoc} (100%) rename Documentation/RelNotes/{2.33.8.txt => 2.33.8.adoc} (100%) rename Documentation/RelNotes/{2.34.0.txt => 2.34.0.adoc} (100%) rename Documentation/RelNotes/{2.34.1.txt => 2.34.1.adoc} (100%) rename Documentation/RelNotes/{2.34.2.txt => 2.34.2.adoc} (100%) rename Documentation/RelNotes/{2.34.3.txt => 2.34.3.adoc} (100%) rename Documentation/RelNotes/{2.34.4.txt => 2.34.4.adoc} (100%) rename Documentation/RelNotes/{2.34.5.txt => 2.34.5.adoc} (100%) rename Documentation/RelNotes/{2.34.6.txt => 2.34.6.adoc} (100%) rename Documentation/RelNotes/{2.34.7.txt => 2.34.7.adoc} (100%) rename Documentation/RelNotes/{2.34.8.txt => 2.34.8.adoc} (100%) rename Documentation/RelNotes/{2.35.0.txt => 2.35.0.adoc} (100%) rename Documentation/RelNotes/{2.35.1.txt => 2.35.1.adoc} (100%) rename Documentation/RelNotes/{2.35.2.txt => 2.35.2.adoc} (100%) rename Documentation/RelNotes/{2.35.3.txt => 2.35.3.adoc} (100%) rename Documentation/RelNotes/{2.35.4.txt => 2.35.4.adoc} (100%) rename Documentation/RelNotes/{2.35.5.txt => 2.35.5.adoc} (100%) rename Documentation/RelNotes/{2.35.6.txt => 2.35.6.adoc} (100%) rename Documentation/RelNotes/{2.35.7.txt => 2.35.7.adoc} (100%) rename Documentation/RelNotes/{2.35.8.txt => 2.35.8.adoc} (100%) rename Documentation/RelNotes/{2.36.0.txt => 2.36.0.adoc} (100%) rename Documentation/RelNotes/{2.36.1.txt => 2.36.1.adoc} (100%) rename Documentation/RelNotes/{2.36.2.txt => 2.36.2.adoc} (100%) rename Documentation/RelNotes/{2.36.3.txt => 2.36.3.adoc} (100%) rename Documentation/RelNotes/{2.36.4.txt => 2.36.4.adoc} (100%) rename Documentation/RelNotes/{2.36.5.txt => 2.36.5.adoc} (100%) rename Documentation/RelNotes/{2.36.6.txt => 2.36.6.adoc} (100%) rename Documentation/RelNotes/{2.37.0.txt => 2.37.0.adoc} (100%) rename Documentation/RelNotes/{2.37.1.txt => 2.37.1.adoc} (100%) rename Documentation/RelNotes/{2.37.2.txt => 2.37.2.adoc} (100%) rename Documentation/RelNotes/{2.37.3.txt => 2.37.3.adoc} (100%) rename Documentation/RelNotes/{2.37.4.txt => 2.37.4.adoc} (100%) rename Documentation/RelNotes/{2.37.5.txt => 2.37.5.adoc} (100%) rename Documentation/RelNotes/{2.37.6.txt => 2.37.6.adoc} (100%) rename Documentation/RelNotes/{2.37.7.txt => 2.37.7.adoc} (100%) rename Documentation/RelNotes/{2.38.0.txt => 2.38.0.adoc} (100%) rename Documentation/RelNotes/{2.38.1.txt => 2.38.1.adoc} (100%) rename Documentation/RelNotes/{2.38.2.txt => 2.38.2.adoc} (100%) rename Documentation/RelNotes/{2.38.3.txt => 2.38.3.adoc} (100%) rename Documentation/RelNotes/{2.38.4.txt => 2.38.4.adoc} (100%) rename Documentation/RelNotes/{2.38.5.txt => 2.38.5.adoc} (100%) rename Documentation/RelNotes/{2.39.0.txt => 2.39.0.adoc} (100%) rename Documentation/RelNotes/{2.39.1.txt => 2.39.1.adoc} (100%) rename Documentation/RelNotes/{2.39.2.txt => 2.39.2.adoc} (100%) rename Documentation/RelNotes/{2.39.3.txt => 2.39.3.adoc} (100%) rename Documentation/RelNotes/{2.39.4.txt => 2.39.4.adoc} (100%) rename Documentation/RelNotes/{2.39.5.txt => 2.39.5.adoc} (100%) rename Documentation/RelNotes/{2.4.0.txt => 2.4.0.adoc} (100%) rename Documentation/RelNotes/{2.4.1.txt => 2.4.1.adoc} (100%) rename Documentation/RelNotes/{2.4.10.txt => 2.4.10.adoc} (100%) rename Documentation/RelNotes/{2.4.11.txt => 2.4.11.adoc} (100%) rename Documentation/RelNotes/{2.4.12.txt => 2.4.12.adoc} (100%) rename Documentation/RelNotes/{2.4.2.txt => 2.4.2.adoc} (100%) rename Documentation/RelNotes/{2.4.3.txt => 2.4.3.adoc} (100%) rename Documentation/RelNotes/{2.4.4.txt => 2.4.4.adoc} (100%) rename Documentation/RelNotes/{2.4.5.txt => 2.4.5.adoc} (100%) rename Documentation/RelNotes/{2.4.6.txt => 2.4.6.adoc} (100%) rename Documentation/RelNotes/{2.4.7.txt => 2.4.7.adoc} (100%) rename Documentation/RelNotes/{2.4.8.txt => 2.4.8.adoc} (100%) rename Documentation/RelNotes/{2.4.9.txt => 2.4.9.adoc} (100%) rename Documentation/RelNotes/{2.40.0.txt => 2.40.0.adoc} (100%) rename Documentation/RelNotes/{2.40.1.txt => 2.40.1.adoc} (100%) rename Documentation/RelNotes/{2.40.2.txt => 2.40.2.adoc} (100%) rename Documentation/RelNotes/{2.40.3.txt => 2.40.3.adoc} (100%) rename Documentation/RelNotes/{2.40.4.txt => 2.40.4.adoc} (100%) rename Documentation/RelNotes/{2.41.0.txt => 2.41.0.adoc} (100%) rename Documentation/RelNotes/{2.41.1.txt => 2.41.1.adoc} (100%) rename Documentation/RelNotes/{2.41.2.txt => 2.41.2.adoc} (100%) rename Documentation/RelNotes/{2.41.3.txt => 2.41.3.adoc} (100%) rename Documentation/RelNotes/{2.42.0.txt => 2.42.0.adoc} (100%) rename Documentation/RelNotes/{2.42.1.txt => 2.42.1.adoc} (100%) rename Documentation/RelNotes/{2.42.2.txt => 2.42.2.adoc} (100%) rename Documentation/RelNotes/{2.42.3.txt => 2.42.3.adoc} (100%) rename Documentation/RelNotes/{2.42.4.txt => 2.42.4.adoc} (100%) rename Documentation/RelNotes/{2.43.0.txt => 2.43.0.adoc} (100%) rename Documentation/RelNotes/{2.43.1.txt => 2.43.1.adoc} (100%) rename Documentation/RelNotes/{2.43.2.txt => 2.43.2.adoc} (100%) rename Documentation/RelNotes/{2.43.3.txt => 2.43.3.adoc} (100%) rename Documentation/RelNotes/{2.43.4.txt => 2.43.4.adoc} (100%) rename Documentation/RelNotes/{2.43.5.txt => 2.43.5.adoc} (100%) rename Documentation/RelNotes/{2.43.6.txt => 2.43.6.adoc} (100%) rename Documentation/RelNotes/{2.44.0.txt => 2.44.0.adoc} (100%) rename Documentation/RelNotes/{2.44.1.txt => 2.44.1.adoc} (100%) rename Documentation/RelNotes/{2.44.2.txt => 2.44.2.adoc} (100%) rename Documentation/RelNotes/{2.44.3.txt => 2.44.3.adoc} (100%) rename Documentation/RelNotes/{2.45.0.txt => 2.45.0.adoc} (100%) rename Documentation/RelNotes/{2.45.1.txt => 2.45.1.adoc} (100%) rename Documentation/RelNotes/{2.45.2.txt => 2.45.2.adoc} (100%) rename Documentation/RelNotes/{2.45.3.txt => 2.45.3.adoc} (100%) rename Documentation/RelNotes/{2.46.0.txt => 2.46.0.adoc} (100%) rename Documentation/RelNotes/{2.46.1.txt => 2.46.1.adoc} (100%) rename Documentation/RelNotes/{2.46.2.txt => 2.46.2.adoc} (100%) rename Documentation/RelNotes/{2.46.3.txt => 2.46.3.adoc} (100%) rename Documentation/RelNotes/{2.47.0.txt => 2.47.0.adoc} (100%) rename Documentation/RelNotes/{2.47.1.txt => 2.47.1.adoc} (100%) rename Documentation/RelNotes/{2.47.2.txt => 2.47.2.adoc} (100%) rename Documentation/RelNotes/{2.48.0.txt => 2.48.0.adoc} (100%) rename Documentation/RelNotes/{2.48.1.txt => 2.48.1.adoc} (100%) rename Documentation/RelNotes/{2.49.0.txt => 2.49.0.adoc} (100%) rename Documentation/RelNotes/{2.5.0.txt => 2.5.0.adoc} (100%) rename Documentation/RelNotes/{2.5.1.txt => 2.5.1.adoc} (100%) rename Documentation/RelNotes/{2.5.2.txt => 2.5.2.adoc} (100%) rename Documentation/RelNotes/{2.5.3.txt => 2.5.3.adoc} (100%) rename Documentation/RelNotes/{2.5.4.txt => 2.5.4.adoc} (100%) rename Documentation/RelNotes/{2.5.5.txt => 2.5.5.adoc} (100%) rename Documentation/RelNotes/{2.5.6.txt => 2.5.6.adoc} (100%) rename Documentation/RelNotes/{2.6.0.txt => 2.6.0.adoc} (100%) rename Documentation/RelNotes/{2.6.1.txt => 2.6.1.adoc} (100%) rename Documentation/RelNotes/{2.6.2.txt => 2.6.2.adoc} (100%) rename Documentation/RelNotes/{2.6.3.txt => 2.6.3.adoc} (100%) rename Documentation/RelNotes/{2.6.4.txt => 2.6.4.adoc} (100%) rename Documentation/RelNotes/{2.6.5.txt => 2.6.5.adoc} (100%) rename Documentation/RelNotes/{2.6.6.txt => 2.6.6.adoc} (100%) rename Documentation/RelNotes/{2.6.7.txt => 2.6.7.adoc} (100%) rename Documentation/RelNotes/{2.7.0.txt => 2.7.0.adoc} (100%) rename Documentation/RelNotes/{2.7.1.txt => 2.7.1.adoc} (100%) rename Documentation/RelNotes/{2.7.2.txt => 2.7.2.adoc} (100%) rename Documentation/RelNotes/{2.7.3.txt => 2.7.3.adoc} (100%) rename Documentation/RelNotes/{2.7.4.txt => 2.7.4.adoc} (100%) rename Documentation/RelNotes/{2.7.5.txt => 2.7.5.adoc} (100%) rename Documentation/RelNotes/{2.7.6.txt => 2.7.6.adoc} (100%) rename Documentation/RelNotes/{2.8.0.txt => 2.8.0.adoc} (100%) rename Documentation/RelNotes/{2.8.1.txt => 2.8.1.adoc} (100%) rename Documentation/RelNotes/{2.8.2.txt => 2.8.2.adoc} (100%) rename Documentation/RelNotes/{2.8.3.txt => 2.8.3.adoc} (100%) rename Documentation/RelNotes/{2.8.4.txt => 2.8.4.adoc} (100%) rename Documentation/RelNotes/{2.8.5.txt => 2.8.5.adoc} (100%) rename Documentation/RelNotes/{2.8.6.txt => 2.8.6.adoc} (100%) rename Documentation/RelNotes/{2.9.0.txt => 2.9.0.adoc} (100%) rename Documentation/RelNotes/{2.9.1.txt => 2.9.1.adoc} (100%) rename Documentation/RelNotes/{2.9.2.txt => 2.9.2.adoc} (100%) rename Documentation/RelNotes/{2.9.3.txt => 2.9.3.adoc} (100%) rename Documentation/RelNotes/{2.9.4.txt => 2.9.4.adoc} (100%) rename Documentation/RelNotes/{2.9.5.txt => 2.9.5.adoc} (100%) rename Documentation/{ReviewingGuidelines.txt => ReviewingGuidelines.adoc} (100%) rename Documentation/{ToolsForGit.txt => ToolsForGit.adoc} (100%) rename Documentation/{blame-options.txt => blame-options.adoc} (99%) rename Documentation/{config.txt => config.adoc} (84%) rename Documentation/config/{add.txt => add.adoc} (100%) rename Documentation/config/{advice.txt => advice.adoc} (100%) rename Documentation/config/{alias.txt => alias.adoc} (100%) rename Documentation/config/{am.txt => am.adoc} (100%) rename Documentation/config/{apply.txt => apply.adoc} (100%) rename Documentation/config/{attr.txt => attr.adoc} (100%) rename Documentation/config/{bitmap-pseudo-merge.txt => bitmap-pseudo-merge.adoc} (100%) rename Documentation/config/{blame.txt => blame.adoc} (100%) rename Documentation/config/{branch.txt => branch.adoc} (100%) rename Documentation/config/{browser.txt => browser.adoc} (100%) rename Documentation/config/{bundle.txt => bundle.adoc} (100%) rename Documentation/config/{checkout.txt => checkout.adoc} (100%) rename Documentation/config/{clean.txt => clean.adoc} (100%) rename Documentation/config/{clone.txt => clone.adoc} (100%) rename Documentation/config/{color.txt => color.adoc} (100%) rename Documentation/config/{column.txt => column.adoc} (100%) rename Documentation/config/{commit.txt => commit.adoc} (100%) rename Documentation/config/{commitgraph.txt => commitgraph.adoc} (100%) rename Documentation/config/{completion.txt => completion.adoc} (100%) rename Documentation/config/{core.txt => core.adoc} (100%) rename Documentation/config/{credential.txt => credential.adoc} (100%) rename Documentation/config/{diff.txt => diff.adoc} (99%) rename Documentation/config/{difftool.txt => difftool.adoc} (100%) rename Documentation/config/{extensions.txt => extensions.adoc} (99%) rename Documentation/config/{fastimport.txt => fastimport.adoc} (100%) rename Documentation/config/{feature.txt => feature.adoc} (100%) rename Documentation/config/{fetch.txt => fetch.adoc} (100%) rename Documentation/config/{filter.txt => filter.adoc} (100%) rename Documentation/config/{fmt-merge-msg.txt => fmt-merge-msg.adoc} (100%) rename Documentation/config/{format.txt => format.adoc} (100%) rename Documentation/config/{fsck.txt => fsck.adoc} (100%) rename Documentation/config/{fsmonitor--daemon.txt => fsmonitor--daemon.adoc} (100%) rename Documentation/config/{gc.txt => gc.adoc} (100%) rename Documentation/config/{gitcvs.txt => gitcvs.adoc} (100%) rename Documentation/config/{gitweb.txt => gitweb.adoc} (100%) rename Documentation/config/{gpg.txt => gpg.adoc} (100%) rename Documentation/config/{grep.txt => grep.adoc} (100%) rename Documentation/config/{gui.txt => gui.adoc} (100%) rename Documentation/config/{guitool.txt => guitool.adoc} (100%) rename Documentation/config/{help.txt => help.adoc} (100%) rename Documentation/config/{http.txt => http.adoc} (100%) rename Documentation/config/{i18n.txt => i18n.adoc} (100%) rename Documentation/config/{imap.txt => imap.adoc} (100%) rename Documentation/config/{includeif.txt => includeif.adoc} (100%) rename Documentation/config/{index.txt => index.adoc} (100%) rename Documentation/config/{init.txt => init.adoc} (100%) rename Documentation/config/{instaweb.txt => instaweb.adoc} (100%) rename Documentation/config/{interactive.txt => interactive.adoc} (100%) rename Documentation/config/{log.txt => log.adoc} (100%) rename Documentation/config/{lsrefs.txt => lsrefs.adoc} (100%) rename Documentation/config/{mailinfo.txt => mailinfo.adoc} (100%) rename Documentation/config/{mailmap.txt => mailmap.adoc} (100%) rename Documentation/config/{maintenance.txt => maintenance.adoc} (100%) rename Documentation/config/{man.txt => man.adoc} (100%) rename Documentation/config/{merge.txt => merge.adoc} (98%) rename Documentation/config/{mergetool.txt => mergetool.adoc} (100%) rename Documentation/config/{notes.txt => notes.adoc} (100%) rename Documentation/config/{pack.txt => pack.adoc} (100%) rename Documentation/config/{pager.txt => pager.adoc} (100%) rename Documentation/config/{pretty.txt => pretty.adoc} (100%) rename Documentation/config/{promisor.txt => promisor.adoc} (100%) rename Documentation/config/{protocol.txt => protocol.adoc} (100%) rename Documentation/config/{pull.txt => pull.adoc} (100%) rename Documentation/config/{push.txt => push.adoc} (100%) rename Documentation/config/{rebase.txt => rebase.adoc} (100%) rename Documentation/config/{receive.txt => receive.adoc} (100%) rename Documentation/config/{reftable.txt => reftable.adoc} (100%) rename Documentation/config/{remote.txt => remote.adoc} (100%) rename Documentation/config/{remotes.txt => remotes.adoc} (100%) rename Documentation/config/{repack.txt => repack.adoc} (100%) rename Documentation/config/{rerere.txt => rerere.adoc} (100%) rename Documentation/config/{revert.txt => revert.adoc} (100%) rename Documentation/config/{safe.txt => safe.adoc} (100%) rename Documentation/config/{sendemail.txt => sendemail.adoc} (100%) rename Documentation/config/{sequencer.txt => sequencer.adoc} (100%) rename Documentation/config/{showbranch.txt => showbranch.adoc} (100%) rename Documentation/config/{sparse.txt => sparse.adoc} (100%) rename Documentation/config/{splitindex.txt => splitindex.adoc} (100%) rename Documentation/config/{ssh.txt => ssh.adoc} (100%) rename Documentation/config/{stash.txt => stash.adoc} (100%) rename Documentation/config/{status.txt => status.adoc} (100%) rename Documentation/config/{submodule.txt => submodule.adoc} (100%) rename Documentation/config/{tag.txt => tag.adoc} (100%) rename Documentation/config/{tar.txt => tar.adoc} (100%) rename Documentation/config/{trace2.txt => trace2.adoc} (98%) rename Documentation/config/{transfer.txt => transfer.adoc} (100%) rename Documentation/config/{uploadarchive.txt => uploadarchive.adoc} (100%) rename Documentation/config/{uploadpack.txt => uploadpack.adoc} (100%) rename Documentation/config/{url.txt => url.adoc} (100%) rename Documentation/config/{user.txt => user.adoc} (100%) rename Documentation/config/{versionsort.txt => versionsort.adoc} (100%) rename Documentation/config/{web.txt => web.adoc} (100%) rename Documentation/config/{worktree.txt => worktree.adoc} (100%) rename Documentation/{date-formats.txt => date-formats.adoc} (100%) rename Documentation/{diff-format.txt => diff-format.adoc} (99%) rename Documentation/{diff-generate-patch.txt => diff-generate-patch.adoc} (100%) rename Documentation/{diff-options.txt => diff-options.adoc} (100%) rename Documentation/{everyday.txto => everyday.adoco} (100%) rename Documentation/{fetch-options.txt => fetch-options.adoc} (100%) rename Documentation/{fsck-msgids.txt => fsck-msgids.adoc} (100%) rename Documentation/{git-add.txt => git-add.adoc} (99%) rename Documentation/{git-am.txt => git-am.adoc} (98%) rename Documentation/{git-annotate.txt => git-annotate.adoc} (96%) rename Documentation/{git-apply.txt => git-apply.adoc} (99%) rename Documentation/{git-archimport.txt => git-archimport.adoc} (100%) rename Documentation/{git-archive.txt => git-archive.adoc} (100%) rename Documentation/{git-bisect-lk2009.txt => git-bisect-lk2009.adoc} (100%) rename Documentation/{git-bisect.txt => git-bisect.adoc} (100%) rename Documentation/{git-blame.txt => git-blame.adoc} (98%) rename Documentation/{git-branch.txt => git-branch.adoc} (99%) rename Documentation/{git-bugreport.txt => git-bugreport.adoc} (100%) rename Documentation/{git-bundle.txt => git-bundle.adoc} (100%) rename Documentation/{git-cat-file.txt => git-cat-file.adoc} (100%) rename Documentation/{git-check-attr.txt => git-check-attr.adoc} (100%) rename Documentation/{git-check-ignore.txt => git-check-ignore.adoc} (100%) rename Documentation/{git-check-mailmap.txt => git-check-mailmap.adoc} (100%) rename Documentation/{git-check-ref-format.txt => git-check-ref-format.adoc} (100%) rename Documentation/{git-checkout-index.txt => git-checkout-index.adoc} (100%) rename Documentation/{git-checkout.txt => git-checkout.adoc} (99%) rename Documentation/{git-cherry-pick.txt => git-cherry-pick.adoc} (99%) rename Documentation/{git-cherry.txt => git-cherry.adoc} (100%) rename Documentation/{git-citool.txt => git-citool.adoc} (100%) rename Documentation/{git-clean.txt => git-clean.adoc} (98%) rename Documentation/{git-clone.txt => git-clone.adoc} (98%) rename Documentation/{git-column.txt => git-column.adoc} (96%) rename Documentation/{git-commit-graph.txt => git-commit-graph.adoc} (98%) rename Documentation/{git-commit-tree.txt => git-commit-tree.adoc} (98%) rename Documentation/{git-commit.txt => git-commit.adoc} (99%) rename Documentation/{git-config.txt => git-config.adoc} (99%) rename Documentation/{git-count-objects.txt => git-count-objects.adoc} (100%) rename Documentation/{git-credential-cache--daemon.txt => git-credential-cache--daemon.adoc} (100%) rename Documentation/{git-credential-cache.txt => git-credential-cache.adoc} (100%) rename Documentation/{git-credential-store.txt => git-credential-store.adoc} (100%) rename Documentation/{git-credential.txt => git-credential.adoc} (100%) rename Documentation/{git-cvsexportcommit.txt => git-cvsexportcommit.adoc} (100%) rename Documentation/{git-cvsimport.txt => git-cvsimport.adoc} (100%) rename Documentation/{git-cvsserver.txt => git-cvsserver.adoc} (100%) rename Documentation/{git-daemon.txt => git-daemon.adoc} (100%) rename Documentation/{git-describe.txt => git-describe.adoc} (100%) rename Documentation/{git-diagnose.txt => git-diagnose.adoc} (100%) rename Documentation/{git-diff-files.txt => git-diff-files.adoc} (95%) rename Documentation/{git-diff-index.txt => git-diff-index.adoc} (98%) rename Documentation/{git-diff-tree.txt => git-diff-tree.adoc} (97%) rename Documentation/{git-diff.txt => git-diff.adoc} (98%) rename Documentation/{git-difftool.txt => git-difftool.adoc} (98%) rename Documentation/{git-fast-export.txt => git-fast-export.adoc} (100%) rename Documentation/{git-fast-import.txt => git-fast-import.adoc} (99%) rename Documentation/{git-fetch-pack.txt => git-fetch-pack.adoc} (100%) rename Documentation/{git-fetch.txt => git-fetch.adoc} (98%) rename Documentation/{git-filter-branch.txt => git-filter-branch.adoc} (100%) rename Documentation/{git-fmt-merge-msg.txt => git-fmt-merge-msg.adoc} (98%) rename Documentation/{git-for-each-ref.txt => git-for-each-ref.adoc} (99%) rename Documentation/{git-for-each-repo.txt => git-for-each-repo.adoc} (100%) rename Documentation/{git-format-patch.txt => git-format-patch.adoc} (99%) rename Documentation/{git-fsck-objects.txt => git-fsck-objects.adoc} (100%) rename Documentation/{git-fsck.txt => git-fsck.adoc} (98%) rename Documentation/{git-fsmonitor--daemon.txt => git-fsmonitor--daemon.adoc} (97%) rename Documentation/{git-gc.txt => git-gc.adoc} (98%) rename Documentation/{git-get-tar-commit-id.txt => git-get-tar-commit-id.adoc} (100%) rename Documentation/{git-grep.txt => git-grep.adoc} (99%) rename Documentation/{git-gui.txt => git-gui.adoc} (100%) rename Documentation/{git-hash-object.txt => git-hash-object.adoc} (100%) rename Documentation/{git-help.txt => git-help.adoc} (100%) rename Documentation/{git-hook.txt => git-hook.adoc} (100%) rename Documentation/{git-http-backend.txt => git-http-backend.adoc} (100%) rename Documentation/{git-http-fetch.txt => git-http-fetch.adoc} (100%) rename Documentation/{git-http-push.txt => git-http-push.adoc} (100%) rename Documentation/{git-imap-send.txt => git-imap-send.adoc} (97%) rename Documentation/{git-index-pack.txt => git-index-pack.adoc} (99%) rename Documentation/{git-init-db.txt => git-init-db.adoc} (100%) rename Documentation/{git-init.txt => git-init.adoc} (97%) rename Documentation/{git-instaweb.txt => git-instaweb.adoc} (100%) rename Documentation/{git-interpret-trailers.txt => git-interpret-trailers.adoc} (100%) rename Documentation/{git-log.txt => git-log.adoc} (95%) rename Documentation/{git-ls-files.txt => git-ls-files.adoc} (100%) rename Documentation/{git-ls-remote.txt => git-ls-remote.adoc} (100%) rename Documentation/{git-ls-tree.txt => git-ls-tree.adoc} (100%) rename Documentation/{git-mailinfo.txt => git-mailinfo.adoc} (97%) rename Documentation/{git-mailsplit.txt => git-mailsplit.adoc} (100%) rename Documentation/{git-maintenance.txt => git-maintenance.adoc} (99%) rename Documentation/{git-merge-base.txt => git-merge-base.adoc} (100%) rename Documentation/{git-merge-file.txt => git-merge-file.adoc} (100%) rename Documentation/{git-merge-index.txt => git-merge-index.adoc} (100%) rename Documentation/{git-merge-one-file.txt => git-merge-one-file.adoc} (100%) rename Documentation/{git-merge-tree.txt => git-merge-tree.adoc} (100%) rename Documentation/{git-merge.txt => git-merge.adoc} (98%) rename Documentation/{git-mergetool--lib.txt => git-mergetool--lib.adoc} (100%) rename Documentation/{git-mergetool.txt => git-mergetool.adoc} (97%) rename Documentation/{git-mktag.txt => git-mktag.adoc} (100%) rename Documentation/{git-mktree.txt => git-mktree.adoc} (100%) rename Documentation/{git-multi-pack-index.txt => git-multi-pack-index.adoc} (100%) rename Documentation/{git-mv.txt => git-mv.adoc} (100%) rename Documentation/{git-name-rev.txt => git-name-rev.adoc} (100%) rename Documentation/{git-notes.txt => git-notes.adoc} (99%) rename Documentation/{git-p4.txt => git-p4.adoc} (100%) rename Documentation/{git-pack-objects.txt => git-pack-objects.adoc} (100%) rename Documentation/{git-pack-redundant.txt => git-pack-redundant.adoc} (100%) rename Documentation/{git-pack-refs.txt => git-pack-refs.adoc} (100%) rename Documentation/{git-patch-id.txt => git-patch-id.adoc} (100%) rename Documentation/{git-prune-packed.txt => git-prune-packed.adoc} (100%) rename Documentation/{git-prune.txt => git-prune.adoc} (100%) rename Documentation/{git-pull.txt => git-pull.adoc} (97%) rename Documentation/{git-push.txt => git-push.adoc} (99%) rename Documentation/{git-quiltimport.txt => git-quiltimport.adoc} (100%) rename Documentation/{git-range-diff.txt => git-range-diff.adoc} (100%) rename Documentation/{git-read-tree.txt => git-read-tree.adoc} (100%) rename Documentation/{git-rebase.txt => git-rebase.adoc} (99%) rename Documentation/{git-receive-pack.txt => git-receive-pack.adoc} (100%) rename Documentation/{git-reflog.txt => git-reflog.adoc} (100%) rename Documentation/{git-refs.txt => git-refs.adoc} (98%) rename Documentation/{git-remote-ext.txt => git-remote-ext.adoc} (100%) rename Documentation/{git-remote-fd.txt => git-remote-fd.adoc} (100%) rename Documentation/{git-remote-helpers.txto => git-remote-helpers.adoco} (100%) rename Documentation/{git-remote.txt => git-remote.adoc} (100%) rename Documentation/{git-repack.txt => git-repack.adoc} (100%) rename Documentation/{git-replace.txt => git-replace.adoc} (100%) rename Documentation/{git-replay.txt => git-replay.adoc} (99%) rename Documentation/{git-request-pull.txt => git-request-pull.adoc} (100%) rename Documentation/{git-rerere.txt => git-rerere.adoc} (100%) rename Documentation/{git-reset.txt => git-reset.adoc} (100%) rename Documentation/{git-restore.txt => git-restore.adoc} (100%) rename Documentation/{git-rev-list.txt => git-rev-list.adoc} (96%) rename Documentation/{git-rev-parse.txt => git-rev-parse.adoc} (99%) rename Documentation/{git-revert.txt => git-revert.adoc} (97%) rename Documentation/{git-rm.txt => git-rm.adoc} (100%) rename Documentation/{git-send-email.txt => git-send-email.adoc} (99%) rename Documentation/{git-send-pack.txt => git-send-pack.adoc} (100%) rename Documentation/{git-sh-i18n--envsubst.txt => git-sh-i18n--envsubst.adoc} (100%) rename Documentation/{git-sh-i18n.txt => git-sh-i18n.adoc} (100%) rename Documentation/{git-sh-setup.txt => git-sh-setup.adoc} (100%) rename Documentation/{git-shell.txt => git-shell.adoc} (100%) rename Documentation/{git-shortlog.txt => git-shortlog.adoc} (99%) rename Documentation/{git-show-branch.txt => git-show-branch.adoc} (98%) rename Documentation/{git-show-index.txt => git-show-index.adoc} (97%) rename Documentation/{git-show-ref.txt => git-show-ref.adoc} (100%) rename Documentation/{git-show.txt => git-show.adoc} (92%) rename Documentation/{git-sparse-checkout.txt => git-sparse-checkout.adoc} (100%) rename Documentation/{git-stage.txt => git-stage.adoc} (100%) rename Documentation/{git-stash.txt => git-stash.adoc} (99%) rename Documentation/{git-status.txt => git-status.adoc} (100%) rename Documentation/{git-stripspace.txt => git-stripspace.adoc} (100%) rename Documentation/{git-submodule.txt => git-submodule.adoc} (100%) rename Documentation/{git-svn.txt => git-svn.adoc} (100%) rename Documentation/{git-switch.txt => git-switch.adoc} (99%) rename Documentation/{git-symbolic-ref.txt => git-symbolic-ref.adoc} (100%) rename Documentation/{git-tag.txt => git-tag.adoc} (99%) rename Documentation/{git-tools.txt => git-tools.adoc} (100%) rename Documentation/{git-unpack-file.txt => git-unpack-file.adoc} (100%) rename Documentation/{git-unpack-objects.txt => git-unpack-objects.adoc} (100%) rename Documentation/{git-update-index.txt => git-update-index.adoc} (100%) rename Documentation/{git-update-ref.txt => git-update-ref.adoc} (100%) rename Documentation/{git-update-server-info.txt => git-update-server-info.adoc} (100%) rename Documentation/{git-upload-archive.txt => git-upload-archive.adoc} (100%) rename Documentation/{git-upload-pack.txt => git-upload-pack.adoc} (100%) rename Documentation/{git-var.txt => git-var.adoc} (100%) rename Documentation/{git-verify-commit.txt => git-verify-commit.adoc} (100%) rename Documentation/{git-verify-pack.txt => git-verify-pack.adoc} (100%) rename Documentation/{git-verify-tag.txt => git-verify-tag.adoc} (100%) rename Documentation/{git-version.txt => git-version.adoc} (100%) rename Documentation/{git-web--browse.txt => git-web--browse.adoc} (100%) rename Documentation/{git-whatchanged.txt => git-whatchanged.adoc} (100%) rename Documentation/{git-worktree.txt => git-worktree.adoc} (100%) rename Documentation/{git-write-tree.txt => git-write-tree.adoc} (100%) rename Documentation/{git.txt => git.adoc} (98%) rename Documentation/{gitattributes.txt => gitattributes.adoc} (100%) rename Documentation/{gitcli.txt => gitcli.adoc} (100%) rename Documentation/{gitcore-tutorial.txt => gitcore-tutorial.adoc} (100%) rename Documentation/{gitcredentials.txt => gitcredentials.adoc} (100%) rename Documentation/{gitcvs-migration.txt => gitcvs-migration.adoc} (100%) rename Documentation/{gitdiffcore.txt => gitdiffcore.adoc} (100%) rename Documentation/{giteveryday.txt => giteveryday.adoc} (100%) rename Documentation/{gitfaq.txt => gitfaq.adoc} (100%) rename Documentation/{gitformat-bundle.txt => gitformat-bundle.adoc} (100%) rename Documentation/{gitformat-chunk.txt => gitformat-chunk.adoc} (100%) rename Documentation/{gitformat-commit-graph.txt => gitformat-commit-graph.adoc} (100%) rename Documentation/{gitformat-index.txt => gitformat-index.adoc} (100%) rename Documentation/{gitformat-pack.txt => gitformat-pack.adoc} (100%) rename Documentation/{gitformat-signature.txt => gitformat-signature.adoc} (100%) rename Documentation/{gitglossary.txt => gitglossary.adoc} (90%) rename Documentation/{githooks.txt => githooks.adoc} (100%) rename Documentation/{gitignore.txt => gitignore.adoc} (100%) rename Documentation/{gitk.txt => gitk.adoc} (99%) rename Documentation/{gitmailmap.txt => gitmailmap.adoc} (100%) rename Documentation/{gitmodules.txt => gitmodules.adoc} (100%) rename Documentation/{gitnamespaces.txt => gitnamespaces.adoc} (98%) rename Documentation/{gitpacking.txt => gitpacking.adoc} (99%) rename Documentation/{gitprotocol-capabilities.txt => gitprotocol-capabilities.adoc} (100%) rename Documentation/{gitprotocol-common.txt => gitprotocol-common.adoc} (100%) rename Documentation/{gitprotocol-http.txt => gitprotocol-http.adoc} (100%) rename Documentation/{gitprotocol-pack.txt => gitprotocol-pack.adoc} (100%) rename Documentation/{gitprotocol-v2.txt => gitprotocol-v2.adoc} (100%) rename Documentation/{gitremote-helpers.txt => gitremote-helpers.adoc} (100%) rename Documentation/{gitrepository-layout.txt => gitrepository-layout.adoc} (99%) rename Documentation/{gitrevisions.txt => gitrevisions.adoc} (96%) rename Documentation/{gitsubmodules.txt => gitsubmodules.adoc} (100%) rename Documentation/{gittutorial-2.txt => gittutorial-2.adoc} (100%) rename Documentation/{gittutorial.txt => gittutorial.adoc} (100%) rename Documentation/{gitweb.txt => gitweb.adoc} (100%) rename Documentation/{gitweb.conf.txt => gitweb.conf.adoc} (100%) rename Documentation/{gitworkflows.txt => gitworkflows.adoc} (100%) rename Documentation/{glossary-content.txt => glossary-content.adoc} (100%) rename Documentation/howto/{coordinate-embargoed-releases.txt => coordinate-embargoed-releases.adoc} (100%) rename Documentation/howto/{keep-canonical-history-correct.txt => keep-canonical-history-correct.adoc} (100%) rename Documentation/howto/{maintain-git.txt => maintain-git.adoc} (100%) rename Documentation/howto/{new-command.txt => new-command.adoc} (100%) rename Documentation/howto/{rebase-from-internal-branch.txt => rebase-from-internal-branch.adoc} (100%) rename Documentation/howto/{rebuild-from-update-hook.txt => rebuild-from-update-hook.adoc} (100%) rename Documentation/howto/{recover-corrupted-blob-object.txt => recover-corrupted-blob-object.adoc} (100%) rename Documentation/howto/{recover-corrupted-object-harder.txt => recover-corrupted-object-harder.adoc} (100%) rename Documentation/howto/{revert-a-faulty-merge.txt => revert-a-faulty-merge.adoc} (100%) rename Documentation/howto/{revert-branch-rebase.txt => revert-branch-rebase.adoc} (100%) rename Documentation/howto/{separating-topic-branches.txt => separating-topic-branches.adoc} (100%) rename Documentation/howto/{setup-git-server-over-http.txt => setup-git-server-over-http.adoc} (100%) rename Documentation/howto/{update-hook-example.txt => update-hook-example.adoc} (100%) rename Documentation/howto/{use-git-daemon.txt => use-git-daemon.adoc} (100%) rename Documentation/howto/{using-merge-subtree.txt => using-merge-subtree.adoc} (100%) rename Documentation/howto/{using-signed-tag-in-pull-request.txt => using-signed-tag-in-pull-request.adoc} (100%) rename Documentation/{i18n.txt => i18n.adoc} (100%) rename Documentation/includes/{cmd-config-section-all.txt => cmd-config-section-all.adoc} (100%) rename Documentation/includes/{cmd-config-section-rest.txt => cmd-config-section-rest.adoc} (100%) rename Documentation/{line-range-format.txt => line-range-format.adoc} (100%) rename Documentation/{line-range-options.txt => line-range-options.adoc} (95%) rename Documentation/{merge-options.txt => merge-options.adoc} (99%) rename Documentation/{merge-strategies.txt => merge-strategies.adoc} (100%) rename Documentation/mergetools/{vimdiff.txt => vimdiff.adoc} (100%) rename Documentation/{object-format-disclaimer.txt => object-format-disclaimer.adoc} (100%) rename Documentation/{pretty-formats.txt => pretty-formats.adoc} (100%) rename Documentation/{pretty-options.txt => pretty-options.adoc} (100%) rename Documentation/{pull-fetch-param.txt => pull-fetch-param.adoc} (100%) rename Documentation/{ref-reachability-filters.txt => ref-reachability-filters.adoc} (100%) rename Documentation/{ref-storage-format.txt => ref-storage-format.adoc} (100%) rename Documentation/{rerere-options.txt => rerere-options.adoc} (100%) rename Documentation/{rev-list-description.txt => rev-list-description.adoc} (100%) rename Documentation/{rev-list-options.txt => rev-list-options.adoc} (99%) rename Documentation/{revisions.txt => revisions.adoc} (100%) rename Documentation/{scalar.txt => scalar.adoc} (100%) rename Documentation/{sequencer.txt => sequencer.adoc} (100%) rename Documentation/{signoff-option.txt => signoff-option.adoc} (100%) rename Documentation/technical/{api-error-handling.txt => api-error-handling.adoc} (100%) rename Documentation/technical/{api-index-skel.txt => api-index-skel.adoc} (100%) rename Documentation/technical/{api-merge.txt => api-merge.adoc} (100%) rename Documentation/technical/{api-parse-options.txt => api-parse-options.adoc} (100%) rename Documentation/technical/{api-simple-ipc.txt => api-simple-ipc.adoc} (100%) rename Documentation/technical/{api-trace2.txt => api-trace2.adoc} (99%) rename Documentation/technical/{bitmap-format.txt => bitmap-format.adoc} (100%) rename Documentation/technical/{build-systems.txt => build-systems.adoc} (100%) rename Documentation/technical/{bundle-uri.txt => bundle-uri.adoc} (100%) rename Documentation/technical/{commit-graph.txt => commit-graph.adoc} (100%) rename Documentation/technical/{directory-rename-detection.txt => directory-rename-detection.adoc} (100%) rename Documentation/technical/{hash-function-transition.txt => hash-function-transition.adoc} (100%) rename Documentation/technical/{long-running-process-protocol.txt => long-running-process-protocol.adoc} (100%) rename Documentation/technical/{multi-pack-index.txt => multi-pack-index.adoc} (100%) rename Documentation/technical/{pack-heuristics.txt => pack-heuristics.adoc} (100%) rename Documentation/technical/{packfile-uri.txt => packfile-uri.adoc} (100%) rename Documentation/technical/{parallel-checkout.txt => parallel-checkout.adoc} (100%) rename Documentation/technical/{partial-clone.txt => partial-clone.adoc} (100%) rename Documentation/technical/{platform-support.txt => platform-support.adoc} (100%) rename Documentation/technical/{racy-git.txt => racy-git.adoc} (100%) rename Documentation/technical/{reftable.txt => reftable.adoc} (100%) rename Documentation/technical/{remembering-renames.txt => remembering-renames.adoc} (100%) rename Documentation/technical/{repository-version.txt => repository-version.adoc} (100%) rename Documentation/technical/{rerere.txt => rerere.adoc} (100%) rename Documentation/technical/{scalar.txt => scalar.adoc} (100%) rename Documentation/technical/{send-pack-pipeline.txt => send-pack-pipeline.adoc} (100%) rename Documentation/technical/{shallow.txt => shallow.adoc} (100%) rename Documentation/technical/{sparse-checkout.txt => sparse-checkout.adoc} (100%) rename Documentation/technical/{sparse-index.txt => sparse-index.adoc} (100%) rename Documentation/technical/{trivial-merge.txt => trivial-merge.adoc} (100%) rename Documentation/technical/{unit-tests.txt => unit-tests.adoc} (100%) rename Documentation/{trace2-target-values.txt => trace2-target-values.adoc} (100%) rename Documentation/{transfer-data-leaks.txt => transfer-data-leaks.adoc} (100%) rename Documentation/{urls-remotes.txt => urls-remotes.adoc} (99%) rename Documentation/{urls.txt => urls.adoc} (100%) rename Documentation/{user-manual.txt => user-manual.adoc} (99%) diff --git a/Documentation/BreakingChanges.txt b/Documentation/BreakingChanges.adoc similarity index 100% rename from Documentation/BreakingChanges.txt rename to Documentation/BreakingChanges.adoc diff --git a/Documentation/DecisionMaking.txt b/Documentation/DecisionMaking.adoc similarity index 100% rename from Documentation/DecisionMaking.txt rename to Documentation/DecisionMaking.adoc diff --git a/Documentation/Makefile b/Documentation/Makefile index aedfe99d1d3..a734c6d6243 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -17,56 +17,56 @@ OBSOLETE_HTML = -include GIT-EXCLUDED-PROGRAMS MAN1_TXT += $(filter-out \ - $(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \ - $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ - $(wildcard git-*.txt)) -MAN1_TXT += git.txt -MAN1_TXT += gitk.txt -MAN1_TXT += gitweb.txt -MAN1_TXT += scalar.txt + $(patsubst %,%.adoc,$(EXCLUDED_PROGRAMS)) \ + $(addsuffix .adoc, $(ARTICLES) $(SP_ARTICLES)), \ + $(wildcard git-*.adoc)) +MAN1_TXT += git.adoc +MAN1_TXT += gitk.adoc +MAN1_TXT += gitweb.adoc +MAN1_TXT += scalar.adoc # man5 / man7 guides (note: new guides should also be added to command-list.txt) -MAN5_TXT += gitattributes.txt -MAN5_TXT += gitformat-bundle.txt -MAN5_TXT += gitformat-chunk.txt -MAN5_TXT += gitformat-commit-graph.txt -MAN5_TXT += gitformat-index.txt -MAN5_TXT += gitformat-pack.txt -MAN5_TXT += gitformat-signature.txt -MAN5_TXT += githooks.txt -MAN5_TXT += gitignore.txt -MAN5_TXT += gitmailmap.txt -MAN5_TXT += gitmodules.txt -MAN5_TXT += gitprotocol-capabilities.txt -MAN5_TXT += gitprotocol-common.txt -MAN5_TXT += gitprotocol-http.txt -MAN5_TXT += gitprotocol-pack.txt -MAN5_TXT += gitprotocol-v2.txt -MAN5_TXT += gitrepository-layout.txt -MAN5_TXT += gitweb.conf.txt - -MAN7_TXT += gitcli.txt -MAN7_TXT += gitcore-tutorial.txt -MAN7_TXT += gitcredentials.txt -MAN7_TXT += gitcvs-migration.txt -MAN7_TXT += gitdiffcore.txt -MAN7_TXT += giteveryday.txt -MAN7_TXT += gitfaq.txt -MAN7_TXT += gitglossary.txt -MAN7_TXT += gitpacking.txt -MAN7_TXT += gitnamespaces.txt -MAN7_TXT += gitremote-helpers.txt -MAN7_TXT += gitrevisions.txt -MAN7_TXT += gitsubmodules.txt -MAN7_TXT += gittutorial-2.txt -MAN7_TXT += gittutorial.txt -MAN7_TXT += gitworkflows.txt - -HOWTO_TXT += $(wildcard howto/*.txt) - -DOC_DEP_TXT += $(wildcard *.txt) -DOC_DEP_TXT += $(wildcard config/*.txt) -DOC_DEP_TXT += $(wildcard includes/*.txt) +MAN5_TXT += gitattributes.adoc +MAN5_TXT += gitformat-bundle.adoc +MAN5_TXT += gitformat-chunk.adoc +MAN5_TXT += gitformat-commit-graph.adoc +MAN5_TXT += gitformat-index.adoc +MAN5_TXT += gitformat-pack.adoc +MAN5_TXT += gitformat-signature.adoc +MAN5_TXT += githooks.adoc +MAN5_TXT += gitignore.adoc +MAN5_TXT += gitmailmap.adoc +MAN5_TXT += gitmodules.adoc +MAN5_TXT += gitprotocol-capabilities.adoc +MAN5_TXT += gitprotocol-common.adoc +MAN5_TXT += gitprotocol-http.adoc +MAN5_TXT += gitprotocol-pack.adoc +MAN5_TXT += gitprotocol-v2.adoc +MAN5_TXT += gitrepository-layout.adoc +MAN5_TXT += gitweb.conf.adoc + +MAN7_TXT += gitcli.adoc +MAN7_TXT += gitcore-tutorial.adoc +MAN7_TXT += gitcredentials.adoc +MAN7_TXT += gitcvs-migration.adoc +MAN7_TXT += gitdiffcore.adoc +MAN7_TXT += giteveryday.adoc +MAN7_TXT += gitfaq.adoc +MAN7_TXT += gitglossary.adoc +MAN7_TXT += gitpacking.adoc +MAN7_TXT += gitnamespaces.adoc +MAN7_TXT += gitremote-helpers.adoc +MAN7_TXT += gitrevisions.adoc +MAN7_TXT += gitsubmodules.adoc +MAN7_TXT += gittutorial-2.adoc +MAN7_TXT += gittutorial.adoc +MAN7_TXT += gitworkflows.adoc + +HOWTO_TXT += $(wildcard howto/*.adoc) + +DOC_DEP_TXT += $(wildcard *.adoc) +DOC_DEP_TXT += $(wildcard config/*.adoc) +DOC_DEP_TXT += $(wildcard includes/*.adoc) ifdef MAN_FILTER MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)) @@ -75,8 +75,8 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) MAN_FILTER = $(MAN_TXT) endif -MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT)) -MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) +MAN_XML = $(patsubst %.adoc,%.xml,$(MAN_TXT)) +MAN_HTML = $(patsubst %.adoc,%.html,$(MAN_TXT)) GIT_MAN_REF = master OBSOLETE_HTML += everyday.html @@ -103,7 +103,7 @@ SP_ARTICLES += howto/rebase-from-internal-branch SP_ARTICLES += howto/keep-canonical-history-correct SP_ARTICLES += howto/maintain-git SP_ARTICLES += howto/coordinate-embargoed-releases -API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt))) +API_DOCS = $(patsubst %.adoc,%,$(filter-out technical/api-index-skel.adoc technical/api-index.adoc, $(wildcard technical/api-*.adoc))) SP_ARTICLES += $(API_DOCS) TECH_DOCS += DecisionMaking @@ -136,9 +136,9 @@ ARTICLES_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES)) HTML_FILTER ?= $(ARTICLES_HTML) $(OBSOLETE_HTML) DOC_HTML = $(MAN_HTML) $(filter $(HTML_FILTER),$(ARTICLES_HTML) $(OBSOLETE_HTML)) -DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT))) -DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT))) -DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT))) +DOC_MAN1 = $(patsubst %.adoc,%.1,$(filter $(MAN_FILTER),$(MAN1_TXT))) +DOC_MAN5 = $(patsubst %.adoc,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT))) +DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT))) prefix ?= $(HOME) bindir ?= $(prefix)/bin @@ -278,7 +278,7 @@ install-pdf: pdf install-html: html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) -mergetools_txt = mergetools-diff.txt mergetools-merge.txt +mergetools_txt = mergetools-diff.adoc mergetools-merge.adoc # # Determine "include::" file references in asciidoc files. @@ -294,18 +294,18 @@ ifneq ($(MAKECMDGOALS),clean) -include doc.dep endif -cmds_txt = cmds-ancillaryinterrogators.txt \ - cmds-ancillarymanipulators.txt \ - cmds-mainporcelain.txt \ - cmds-plumbinginterrogators.txt \ - cmds-plumbingmanipulators.txt \ - cmds-synchingrepositories.txt \ - cmds-synchelpers.txt \ - cmds-guide.txt \ - cmds-developerinterfaces.txt \ - cmds-userinterfaces.txt \ - cmds-purehelpers.txt \ - cmds-foreignscminterface.txt +cmds_txt = cmds-ancillaryinterrogators.adoc \ + cmds-ancillarymanipulators.adoc \ + cmds-mainporcelain.adoc \ + cmds-plumbinginterrogators.adoc \ + cmds-plumbingmanipulators.adoc \ + cmds-synchingrepositories.adoc \ + cmds-synchelpers.adoc \ + cmds-guide.adoc \ + cmds-developerinterfaces.adoc \ + cmds-userinterfaces.adoc \ + cmds-purehelpers.adoc \ + cmds-foreignscminterface.adoc $(cmds_txt): cmd-list.made @@ -313,10 +313,10 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) $(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl .. . $(cmds_txt) && \ date >$@ -mergetools-%.txt: generate-mergetool-list.sh ../git-mergetool--lib.sh $(wildcard ../mergetools/*) -mergetools-diff.txt: +mergetools-%.adoc: generate-mergetool-list.sh ../git-mergetool--lib.sh $(wildcard ../mergetools/*) +mergetools-diff.adoc: $(QUIET_GEN)$(SHELL_PATH) ./generate-mergetool-list.sh .. diff $@ -mergetools-merge.txt: +mergetools-merge.adoc: $(QUIET_GEN)$(SHELL_PATH) ./generate-mergetool-list.sh .. merge $@ TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK)) @@ -333,9 +333,9 @@ clean: $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 $(RM) *.texi *.texi+ *.texi++ git.info gitman.info $(RM) *.pdf - $(RM) howto-index.txt howto/*.html doc.dep - $(RM) technical/*.html technical/api-index.txt - $(RM) SubmittingPatches.txt + $(RM) howto-index.adoc howto/*.html doc.dep + $(RM) technical/*.html technical/api-index.adoc + $(RM) SubmittingPatches.adoc $(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) GIT-ASCIIDOCFLAGS $(RM) asciidoc.conf asciidoctor-extensions.rb @@ -344,10 +344,10 @@ clean: docinfo.html: docinfo-html.in $(QUIET_GEN)$(RM) $@ && cat $< >$@ -$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) +$(MAN_HTML): %.html : %.adoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< -$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) +$(OBSOLETE_HTML): %.html : %.adoco $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-prereqs := $(wildcard manpage*.xsl) @@ -360,22 +360,22 @@ manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.7 : %.xml $(manpage-prereqs) $(manpage-cmd) -%.xml : %.txt $(ASCIIDOC_DEPS) +%.xml : %.adoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< -user-manual.xml: user-manual.txt $(ASCIIDOC_DEPS) +user-manual.xml: user-manual.adoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $< -technical/api-index.txt: technical/api-index-skel.txt \ - technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) - $(QUIET_GEN)'$(SHELL_PATH_SQ)' technical/api-index.sh ./technical ./technical/api-index.txt +technical/api-index.adoc: technical/api-index-skel.adoc \ + technical/api-index.sh $(patsubst %,%.adoc,$(API_DOCS)) + $(QUIET_GEN)'$(SHELL_PATH_SQ)' technical/api-index.sh ./technical ./technical/api-index.adoc technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ -$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \ +$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.adoc \ $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.adoc -SubmittingPatches.txt: SubmittingPatches +SubmittingPatches.adoc: SubmittingPatches $(QUIET_GEN) cp $< $@ XSLT = docbook.xsl @@ -409,19 +409,19 @@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $< -$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml +$(patsubst %.adoc,%.texi,$(MAN_TXT)): %.texi : %.xml $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@ -howto-index.txt: howto/howto-index.sh $(HOWTO_TXT) +howto-index.adoc: howto/howto-index.sh $(HOWTO_TXT) $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto/howto-index.sh $(sort $(HOWTO_TXT)) >$@ -$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt +$(patsubst %,%.html,$(ARTICLES)) : %.html : %.adoc $(ASCIIDOC_DEPS) + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.adoc WEBDOC_DEST = /pub/software/scm/git/docs howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ -$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt $(ASCIIDOC_DEPS) +$(patsubst %.adoc,%.html,$(HOWTO_TXT)): %.html : %.adoc $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC) \ sed -e '1,/^$$/d' $< | \ $(TXT_TO_HTML) - >$@ @@ -452,9 +452,9 @@ print-man1: @for i in $(MAN1_TXT); do echo $$i; done ## Lint: gitlink -LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT)) +LINT_DOCS_GITLINK = $(patsubst %.adoc,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT)) $(LINT_DOCS_GITLINK): lint-gitlink.perl -$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt +$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.adoc $(call mkdir_p_parent_template) $(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \ $< \ @@ -466,17 +466,17 @@ $(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt lint-docs-gitlink: $(LINT_DOCS_GITLINK) ## Lint: man-end-blurb -LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT)) +LINT_DOCS_MAN_END_BLURB = $(patsubst %.adoc,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT)) $(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl -$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt +$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.adoc $(call mkdir_p_parent_template) $(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@ .PHONY: lint-docs-man-end-blurb ## Lint: man-section-order -LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT)) +LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.adoc,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT)) $(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl -$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt +$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.adoc $(call mkdir_p_parent_template) $(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@ .PHONY: lint-docs-man-section-order @@ -485,10 +485,10 @@ lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER) .PHONY: lint-docs-fsck-msgids LINT_DOCS_FSCK_MSGIDS = .build/lint-docs/fsck-msgids.ok $(LINT_DOCS_FSCK_MSGIDS): lint-fsck-msgids.perl -$(LINT_DOCS_FSCK_MSGIDS): ../fsck.h fsck-msgids.txt +$(LINT_DOCS_FSCK_MSGIDS): ../fsck.h fsck-msgids.adoc $(call mkdir_p_parent_template) $(QUIET_GEN)$(PERL_PATH) lint-fsck-msgids.perl \ - ../fsck.h fsck-msgids.txt $@ + ../fsck.h fsck-msgids.adoc $@ lint-docs-fsck-msgids: $(LINT_DOCS_FSCK_MSGIDS) @@ -501,11 +501,11 @@ lint-docs-meson: @mkdir -p tmp-meson-diff && \ awk "/^manpages = {$$/ {flag=1 ; next } /^}$$/ { flag=0 } flag { gsub(/^ \047/, \"\"); gsub(/\047 : [157],\$$/, \"\"); print }" meson.build | \ grep -v -e '#' -e '^$$' | \ - sort >tmp-meson-diff/meson.txt && \ - ls git*.txt scalar.txt | grep -v -e git-bisect-lk2009.txt -e git-tools.txt >tmp-meson-diff/actual.txt && \ - if ! cmp tmp-meson-diff/meson.txt tmp-meson-diff/actual.txt; then \ + sort >tmp-meson-diff/meson.adoc && \ + ls git*.adoc scalar.adoc | grep -v -e git-bisect-lk2009.adoc -e git-tools.adoc >tmp-meson-diff/actual.adoc && \ + if ! cmp tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; then \ echo "Meson man pages differ from actual man pages:"; \ - diff -u tmp-meson-diff/meson.txt tmp-meson-diff/actual.txt; \ + diff -u tmp-meson-diff/meson.adoc tmp-meson-diff/actual.adoc; \ exit 1; \ fi diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.adoc similarity index 100% rename from Documentation/MyFirstContribution.txt rename to Documentation/MyFirstContribution.adoc diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.adoc similarity index 100% rename from Documentation/MyFirstObjectWalk.txt rename to Documentation/MyFirstObjectWalk.adoc diff --git a/Documentation/RelNotes/1.5.0.1.txt b/Documentation/RelNotes/1.5.0.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.1.txt rename to Documentation/RelNotes/1.5.0.1.adoc diff --git a/Documentation/RelNotes/1.5.0.2.txt b/Documentation/RelNotes/1.5.0.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.2.txt rename to Documentation/RelNotes/1.5.0.2.adoc diff --git a/Documentation/RelNotes/1.5.0.3.txt b/Documentation/RelNotes/1.5.0.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.3.txt rename to Documentation/RelNotes/1.5.0.3.adoc diff --git a/Documentation/RelNotes/1.5.0.4.txt b/Documentation/RelNotes/1.5.0.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.4.txt rename to Documentation/RelNotes/1.5.0.4.adoc diff --git a/Documentation/RelNotes/1.5.0.5.txt b/Documentation/RelNotes/1.5.0.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.5.txt rename to Documentation/RelNotes/1.5.0.5.adoc diff --git a/Documentation/RelNotes/1.5.0.6.txt b/Documentation/RelNotes/1.5.0.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.6.txt rename to Documentation/RelNotes/1.5.0.6.adoc diff --git a/Documentation/RelNotes/1.5.0.7.txt b/Documentation/RelNotes/1.5.0.7.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.7.txt rename to Documentation/RelNotes/1.5.0.7.adoc diff --git a/Documentation/RelNotes/1.5.0.txt b/Documentation/RelNotes/1.5.0.adoc similarity index 100% rename from Documentation/RelNotes/1.5.0.txt rename to Documentation/RelNotes/1.5.0.adoc diff --git a/Documentation/RelNotes/1.5.1.1.txt b/Documentation/RelNotes/1.5.1.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.1.txt rename to Documentation/RelNotes/1.5.1.1.adoc diff --git a/Documentation/RelNotes/1.5.1.2.txt b/Documentation/RelNotes/1.5.1.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.2.txt rename to Documentation/RelNotes/1.5.1.2.adoc diff --git a/Documentation/RelNotes/1.5.1.3.txt b/Documentation/RelNotes/1.5.1.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.3.txt rename to Documentation/RelNotes/1.5.1.3.adoc diff --git a/Documentation/RelNotes/1.5.1.4.txt b/Documentation/RelNotes/1.5.1.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.4.txt rename to Documentation/RelNotes/1.5.1.4.adoc diff --git a/Documentation/RelNotes/1.5.1.5.txt b/Documentation/RelNotes/1.5.1.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.5.txt rename to Documentation/RelNotes/1.5.1.5.adoc diff --git a/Documentation/RelNotes/1.5.1.6.txt b/Documentation/RelNotes/1.5.1.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.6.txt rename to Documentation/RelNotes/1.5.1.6.adoc diff --git a/Documentation/RelNotes/1.5.1.txt b/Documentation/RelNotes/1.5.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.1.txt rename to Documentation/RelNotes/1.5.1.adoc diff --git a/Documentation/RelNotes/1.5.2.1.txt b/Documentation/RelNotes/1.5.2.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.1.txt rename to Documentation/RelNotes/1.5.2.1.adoc diff --git a/Documentation/RelNotes/1.5.2.2.txt b/Documentation/RelNotes/1.5.2.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.2.txt rename to Documentation/RelNotes/1.5.2.2.adoc diff --git a/Documentation/RelNotes/1.5.2.3.txt b/Documentation/RelNotes/1.5.2.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.3.txt rename to Documentation/RelNotes/1.5.2.3.adoc diff --git a/Documentation/RelNotes/1.5.2.4.txt b/Documentation/RelNotes/1.5.2.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.4.txt rename to Documentation/RelNotes/1.5.2.4.adoc diff --git a/Documentation/RelNotes/1.5.2.5.txt b/Documentation/RelNotes/1.5.2.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.5.txt rename to Documentation/RelNotes/1.5.2.5.adoc diff --git a/Documentation/RelNotes/1.5.2.txt b/Documentation/RelNotes/1.5.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.2.txt rename to Documentation/RelNotes/1.5.2.adoc diff --git a/Documentation/RelNotes/1.5.3.1.txt b/Documentation/RelNotes/1.5.3.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.1.txt rename to Documentation/RelNotes/1.5.3.1.adoc diff --git a/Documentation/RelNotes/1.5.3.2.txt b/Documentation/RelNotes/1.5.3.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.2.txt rename to Documentation/RelNotes/1.5.3.2.adoc diff --git a/Documentation/RelNotes/1.5.3.3.txt b/Documentation/RelNotes/1.5.3.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.3.txt rename to Documentation/RelNotes/1.5.3.3.adoc diff --git a/Documentation/RelNotes/1.5.3.4.txt b/Documentation/RelNotes/1.5.3.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.4.txt rename to Documentation/RelNotes/1.5.3.4.adoc diff --git a/Documentation/RelNotes/1.5.3.5.txt b/Documentation/RelNotes/1.5.3.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.5.txt rename to Documentation/RelNotes/1.5.3.5.adoc diff --git a/Documentation/RelNotes/1.5.3.6.txt b/Documentation/RelNotes/1.5.3.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.6.txt rename to Documentation/RelNotes/1.5.3.6.adoc diff --git a/Documentation/RelNotes/1.5.3.7.txt b/Documentation/RelNotes/1.5.3.7.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.7.txt rename to Documentation/RelNotes/1.5.3.7.adoc diff --git a/Documentation/RelNotes/1.5.3.8.txt b/Documentation/RelNotes/1.5.3.8.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.8.txt rename to Documentation/RelNotes/1.5.3.8.adoc diff --git a/Documentation/RelNotes/1.5.3.txt b/Documentation/RelNotes/1.5.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.3.txt rename to Documentation/RelNotes/1.5.3.adoc diff --git a/Documentation/RelNotes/1.5.4.1.txt b/Documentation/RelNotes/1.5.4.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.1.txt rename to Documentation/RelNotes/1.5.4.1.adoc diff --git a/Documentation/RelNotes/1.5.4.2.txt b/Documentation/RelNotes/1.5.4.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.2.txt rename to Documentation/RelNotes/1.5.4.2.adoc diff --git a/Documentation/RelNotes/1.5.4.3.txt b/Documentation/RelNotes/1.5.4.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.3.txt rename to Documentation/RelNotes/1.5.4.3.adoc diff --git a/Documentation/RelNotes/1.5.4.4.txt b/Documentation/RelNotes/1.5.4.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.4.txt rename to Documentation/RelNotes/1.5.4.4.adoc diff --git a/Documentation/RelNotes/1.5.4.5.txt b/Documentation/RelNotes/1.5.4.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.5.txt rename to Documentation/RelNotes/1.5.4.5.adoc diff --git a/Documentation/RelNotes/1.5.4.6.txt b/Documentation/RelNotes/1.5.4.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.6.txt rename to Documentation/RelNotes/1.5.4.6.adoc diff --git a/Documentation/RelNotes/1.5.4.7.txt b/Documentation/RelNotes/1.5.4.7.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.7.txt rename to Documentation/RelNotes/1.5.4.7.adoc diff --git a/Documentation/RelNotes/1.5.4.txt b/Documentation/RelNotes/1.5.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.4.txt rename to Documentation/RelNotes/1.5.4.adoc diff --git a/Documentation/RelNotes/1.5.5.1.txt b/Documentation/RelNotes/1.5.5.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.1.txt rename to Documentation/RelNotes/1.5.5.1.adoc diff --git a/Documentation/RelNotes/1.5.5.2.txt b/Documentation/RelNotes/1.5.5.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.2.txt rename to Documentation/RelNotes/1.5.5.2.adoc diff --git a/Documentation/RelNotes/1.5.5.3.txt b/Documentation/RelNotes/1.5.5.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.3.txt rename to Documentation/RelNotes/1.5.5.3.adoc diff --git a/Documentation/RelNotes/1.5.5.4.txt b/Documentation/RelNotes/1.5.5.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.4.txt rename to Documentation/RelNotes/1.5.5.4.adoc diff --git a/Documentation/RelNotes/1.5.5.5.txt b/Documentation/RelNotes/1.5.5.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.5.txt rename to Documentation/RelNotes/1.5.5.5.adoc diff --git a/Documentation/RelNotes/1.5.5.6.txt b/Documentation/RelNotes/1.5.5.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.6.txt rename to Documentation/RelNotes/1.5.5.6.adoc diff --git a/Documentation/RelNotes/1.5.5.txt b/Documentation/RelNotes/1.5.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.5.txt rename to Documentation/RelNotes/1.5.5.adoc diff --git a/Documentation/RelNotes/1.5.6.1.txt b/Documentation/RelNotes/1.5.6.1.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.1.txt rename to Documentation/RelNotes/1.5.6.1.adoc diff --git a/Documentation/RelNotes/1.5.6.2.txt b/Documentation/RelNotes/1.5.6.2.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.2.txt rename to Documentation/RelNotes/1.5.6.2.adoc diff --git a/Documentation/RelNotes/1.5.6.3.txt b/Documentation/RelNotes/1.5.6.3.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.3.txt rename to Documentation/RelNotes/1.5.6.3.adoc diff --git a/Documentation/RelNotes/1.5.6.4.txt b/Documentation/RelNotes/1.5.6.4.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.4.txt rename to Documentation/RelNotes/1.5.6.4.adoc diff --git a/Documentation/RelNotes/1.5.6.5.txt b/Documentation/RelNotes/1.5.6.5.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.5.txt rename to Documentation/RelNotes/1.5.6.5.adoc diff --git a/Documentation/RelNotes/1.5.6.6.txt b/Documentation/RelNotes/1.5.6.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.6.txt rename to Documentation/RelNotes/1.5.6.6.adoc diff --git a/Documentation/RelNotes/1.5.6.txt b/Documentation/RelNotes/1.5.6.adoc similarity index 100% rename from Documentation/RelNotes/1.5.6.txt rename to Documentation/RelNotes/1.5.6.adoc diff --git a/Documentation/RelNotes/1.6.0.1.txt b/Documentation/RelNotes/1.6.0.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.1.txt rename to Documentation/RelNotes/1.6.0.1.adoc diff --git a/Documentation/RelNotes/1.6.0.2.txt b/Documentation/RelNotes/1.6.0.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.2.txt rename to Documentation/RelNotes/1.6.0.2.adoc diff --git a/Documentation/RelNotes/1.6.0.3.txt b/Documentation/RelNotes/1.6.0.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.3.txt rename to Documentation/RelNotes/1.6.0.3.adoc diff --git a/Documentation/RelNotes/1.6.0.4.txt b/Documentation/RelNotes/1.6.0.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.4.txt rename to Documentation/RelNotes/1.6.0.4.adoc diff --git a/Documentation/RelNotes/1.6.0.5.txt b/Documentation/RelNotes/1.6.0.5.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.5.txt rename to Documentation/RelNotes/1.6.0.5.adoc diff --git a/Documentation/RelNotes/1.6.0.6.txt b/Documentation/RelNotes/1.6.0.6.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.6.txt rename to Documentation/RelNotes/1.6.0.6.adoc diff --git a/Documentation/RelNotes/1.6.0.txt b/Documentation/RelNotes/1.6.0.adoc similarity index 100% rename from Documentation/RelNotes/1.6.0.txt rename to Documentation/RelNotes/1.6.0.adoc diff --git a/Documentation/RelNotes/1.6.1.1.txt b/Documentation/RelNotes/1.6.1.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.1.1.txt rename to Documentation/RelNotes/1.6.1.1.adoc diff --git a/Documentation/RelNotes/1.6.1.2.txt b/Documentation/RelNotes/1.6.1.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.1.2.txt rename to Documentation/RelNotes/1.6.1.2.adoc diff --git a/Documentation/RelNotes/1.6.1.3.txt b/Documentation/RelNotes/1.6.1.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.1.3.txt rename to Documentation/RelNotes/1.6.1.3.adoc diff --git a/Documentation/RelNotes/1.6.1.4.txt b/Documentation/RelNotes/1.6.1.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.1.4.txt rename to Documentation/RelNotes/1.6.1.4.adoc diff --git a/Documentation/RelNotes/1.6.1.txt b/Documentation/RelNotes/1.6.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.1.txt rename to Documentation/RelNotes/1.6.1.adoc diff --git a/Documentation/RelNotes/1.6.2.1.txt b/Documentation/RelNotes/1.6.2.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.1.txt rename to Documentation/RelNotes/1.6.2.1.adoc diff --git a/Documentation/RelNotes/1.6.2.2.txt b/Documentation/RelNotes/1.6.2.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.2.txt rename to Documentation/RelNotes/1.6.2.2.adoc diff --git a/Documentation/RelNotes/1.6.2.3.txt b/Documentation/RelNotes/1.6.2.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.3.txt rename to Documentation/RelNotes/1.6.2.3.adoc diff --git a/Documentation/RelNotes/1.6.2.4.txt b/Documentation/RelNotes/1.6.2.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.4.txt rename to Documentation/RelNotes/1.6.2.4.adoc diff --git a/Documentation/RelNotes/1.6.2.5.txt b/Documentation/RelNotes/1.6.2.5.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.5.txt rename to Documentation/RelNotes/1.6.2.5.adoc diff --git a/Documentation/RelNotes/1.6.2.txt b/Documentation/RelNotes/1.6.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.2.txt rename to Documentation/RelNotes/1.6.2.adoc diff --git a/Documentation/RelNotes/1.6.3.1.txt b/Documentation/RelNotes/1.6.3.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.3.1.txt rename to Documentation/RelNotes/1.6.3.1.adoc diff --git a/Documentation/RelNotes/1.6.3.2.txt b/Documentation/RelNotes/1.6.3.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.3.2.txt rename to Documentation/RelNotes/1.6.3.2.adoc diff --git a/Documentation/RelNotes/1.6.3.3.txt b/Documentation/RelNotes/1.6.3.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.3.3.txt rename to Documentation/RelNotes/1.6.3.3.adoc diff --git a/Documentation/RelNotes/1.6.3.4.txt b/Documentation/RelNotes/1.6.3.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.3.4.txt rename to Documentation/RelNotes/1.6.3.4.adoc diff --git a/Documentation/RelNotes/1.6.3.txt b/Documentation/RelNotes/1.6.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.3.txt rename to Documentation/RelNotes/1.6.3.adoc diff --git a/Documentation/RelNotes/1.6.4.1.txt b/Documentation/RelNotes/1.6.4.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.1.txt rename to Documentation/RelNotes/1.6.4.1.adoc diff --git a/Documentation/RelNotes/1.6.4.2.txt b/Documentation/RelNotes/1.6.4.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.2.txt rename to Documentation/RelNotes/1.6.4.2.adoc diff --git a/Documentation/RelNotes/1.6.4.3.txt b/Documentation/RelNotes/1.6.4.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.3.txt rename to Documentation/RelNotes/1.6.4.3.adoc diff --git a/Documentation/RelNotes/1.6.4.4.txt b/Documentation/RelNotes/1.6.4.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.4.txt rename to Documentation/RelNotes/1.6.4.4.adoc diff --git a/Documentation/RelNotes/1.6.4.5.txt b/Documentation/RelNotes/1.6.4.5.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.5.txt rename to Documentation/RelNotes/1.6.4.5.adoc diff --git a/Documentation/RelNotes/1.6.4.txt b/Documentation/RelNotes/1.6.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.4.txt rename to Documentation/RelNotes/1.6.4.adoc diff --git a/Documentation/RelNotes/1.6.5.1.txt b/Documentation/RelNotes/1.6.5.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.1.txt rename to Documentation/RelNotes/1.6.5.1.adoc diff --git a/Documentation/RelNotes/1.6.5.2.txt b/Documentation/RelNotes/1.6.5.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.2.txt rename to Documentation/RelNotes/1.6.5.2.adoc diff --git a/Documentation/RelNotes/1.6.5.3.txt b/Documentation/RelNotes/1.6.5.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.3.txt rename to Documentation/RelNotes/1.6.5.3.adoc diff --git a/Documentation/RelNotes/1.6.5.4.txt b/Documentation/RelNotes/1.6.5.4.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.4.txt rename to Documentation/RelNotes/1.6.5.4.adoc diff --git a/Documentation/RelNotes/1.6.5.5.txt b/Documentation/RelNotes/1.6.5.5.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.5.txt rename to Documentation/RelNotes/1.6.5.5.adoc diff --git a/Documentation/RelNotes/1.6.5.6.txt b/Documentation/RelNotes/1.6.5.6.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.6.txt rename to Documentation/RelNotes/1.6.5.6.adoc diff --git a/Documentation/RelNotes/1.6.5.7.txt b/Documentation/RelNotes/1.6.5.7.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.7.txt rename to Documentation/RelNotes/1.6.5.7.adoc diff --git a/Documentation/RelNotes/1.6.5.8.txt b/Documentation/RelNotes/1.6.5.8.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.8.txt rename to Documentation/RelNotes/1.6.5.8.adoc diff --git a/Documentation/RelNotes/1.6.5.9.txt b/Documentation/RelNotes/1.6.5.9.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.9.txt rename to Documentation/RelNotes/1.6.5.9.adoc diff --git a/Documentation/RelNotes/1.6.5.txt b/Documentation/RelNotes/1.6.5.adoc similarity index 100% rename from Documentation/RelNotes/1.6.5.txt rename to Documentation/RelNotes/1.6.5.adoc diff --git a/Documentation/RelNotes/1.6.6.1.txt b/Documentation/RelNotes/1.6.6.1.adoc similarity index 100% rename from Documentation/RelNotes/1.6.6.1.txt rename to Documentation/RelNotes/1.6.6.1.adoc diff --git a/Documentation/RelNotes/1.6.6.2.txt b/Documentation/RelNotes/1.6.6.2.adoc similarity index 100% rename from Documentation/RelNotes/1.6.6.2.txt rename to Documentation/RelNotes/1.6.6.2.adoc diff --git a/Documentation/RelNotes/1.6.6.3.txt b/Documentation/RelNotes/1.6.6.3.adoc similarity index 100% rename from Documentation/RelNotes/1.6.6.3.txt rename to Documentation/RelNotes/1.6.6.3.adoc diff --git a/Documentation/RelNotes/1.6.6.txt b/Documentation/RelNotes/1.6.6.adoc similarity index 100% rename from Documentation/RelNotes/1.6.6.txt rename to Documentation/RelNotes/1.6.6.adoc diff --git a/Documentation/RelNotes/1.7.0.1.txt b/Documentation/RelNotes/1.7.0.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.1.txt rename to Documentation/RelNotes/1.7.0.1.adoc diff --git a/Documentation/RelNotes/1.7.0.2.txt b/Documentation/RelNotes/1.7.0.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.2.txt rename to Documentation/RelNotes/1.7.0.2.adoc diff --git a/Documentation/RelNotes/1.7.0.3.txt b/Documentation/RelNotes/1.7.0.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.3.txt rename to Documentation/RelNotes/1.7.0.3.adoc diff --git a/Documentation/RelNotes/1.7.0.4.txt b/Documentation/RelNotes/1.7.0.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.4.txt rename to Documentation/RelNotes/1.7.0.4.adoc diff --git a/Documentation/RelNotes/1.7.0.5.txt b/Documentation/RelNotes/1.7.0.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.5.txt rename to Documentation/RelNotes/1.7.0.5.adoc diff --git a/Documentation/RelNotes/1.7.0.6.txt b/Documentation/RelNotes/1.7.0.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.6.txt rename to Documentation/RelNotes/1.7.0.6.adoc diff --git a/Documentation/RelNotes/1.7.0.7.txt b/Documentation/RelNotes/1.7.0.7.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.7.txt rename to Documentation/RelNotes/1.7.0.7.adoc diff --git a/Documentation/RelNotes/1.7.0.8.txt b/Documentation/RelNotes/1.7.0.8.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.8.txt rename to Documentation/RelNotes/1.7.0.8.adoc diff --git a/Documentation/RelNotes/1.7.0.9.txt b/Documentation/RelNotes/1.7.0.9.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.9.txt rename to Documentation/RelNotes/1.7.0.9.adoc diff --git a/Documentation/RelNotes/1.7.0.txt b/Documentation/RelNotes/1.7.0.adoc similarity index 100% rename from Documentation/RelNotes/1.7.0.txt rename to Documentation/RelNotes/1.7.0.adoc diff --git a/Documentation/RelNotes/1.7.1.1.txt b/Documentation/RelNotes/1.7.1.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.1.1.txt rename to Documentation/RelNotes/1.7.1.1.adoc diff --git a/Documentation/RelNotes/1.7.1.2.txt b/Documentation/RelNotes/1.7.1.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.1.2.txt rename to Documentation/RelNotes/1.7.1.2.adoc diff --git a/Documentation/RelNotes/1.7.1.3.txt b/Documentation/RelNotes/1.7.1.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.1.3.txt rename to Documentation/RelNotes/1.7.1.3.adoc diff --git a/Documentation/RelNotes/1.7.1.4.txt b/Documentation/RelNotes/1.7.1.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.1.4.txt rename to Documentation/RelNotes/1.7.1.4.adoc diff --git a/Documentation/RelNotes/1.7.1.txt b/Documentation/RelNotes/1.7.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.1.txt rename to Documentation/RelNotes/1.7.1.adoc diff --git a/Documentation/RelNotes/1.7.10.1.txt b/Documentation/RelNotes/1.7.10.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.1.txt rename to Documentation/RelNotes/1.7.10.1.adoc diff --git a/Documentation/RelNotes/1.7.10.2.txt b/Documentation/RelNotes/1.7.10.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.2.txt rename to Documentation/RelNotes/1.7.10.2.adoc diff --git a/Documentation/RelNotes/1.7.10.3.txt b/Documentation/RelNotes/1.7.10.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.3.txt rename to Documentation/RelNotes/1.7.10.3.adoc diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.4.txt rename to Documentation/RelNotes/1.7.10.4.adoc diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.5.txt rename to Documentation/RelNotes/1.7.10.5.adoc diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.adoc similarity index 100% rename from Documentation/RelNotes/1.7.10.txt rename to Documentation/RelNotes/1.7.10.adoc diff --git a/Documentation/RelNotes/1.7.11.1.txt b/Documentation/RelNotes/1.7.11.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.1.txt rename to Documentation/RelNotes/1.7.11.1.adoc diff --git a/Documentation/RelNotes/1.7.11.2.txt b/Documentation/RelNotes/1.7.11.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.2.txt rename to Documentation/RelNotes/1.7.11.2.adoc diff --git a/Documentation/RelNotes/1.7.11.3.txt b/Documentation/RelNotes/1.7.11.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.3.txt rename to Documentation/RelNotes/1.7.11.3.adoc diff --git a/Documentation/RelNotes/1.7.11.4.txt b/Documentation/RelNotes/1.7.11.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.4.txt rename to Documentation/RelNotes/1.7.11.4.adoc diff --git a/Documentation/RelNotes/1.7.11.5.txt b/Documentation/RelNotes/1.7.11.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.5.txt rename to Documentation/RelNotes/1.7.11.5.adoc diff --git a/Documentation/RelNotes/1.7.11.6.txt b/Documentation/RelNotes/1.7.11.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.6.txt rename to Documentation/RelNotes/1.7.11.6.adoc diff --git a/Documentation/RelNotes/1.7.11.7.txt b/Documentation/RelNotes/1.7.11.7.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.7.txt rename to Documentation/RelNotes/1.7.11.7.adoc diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.adoc similarity index 100% rename from Documentation/RelNotes/1.7.11.txt rename to Documentation/RelNotes/1.7.11.adoc diff --git a/Documentation/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.12.1.txt rename to Documentation/RelNotes/1.7.12.1.adoc diff --git a/Documentation/RelNotes/1.7.12.2.txt b/Documentation/RelNotes/1.7.12.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.12.2.txt rename to Documentation/RelNotes/1.7.12.2.adoc diff --git a/Documentation/RelNotes/1.7.12.3.txt b/Documentation/RelNotes/1.7.12.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.12.3.txt rename to Documentation/RelNotes/1.7.12.3.adoc diff --git a/Documentation/RelNotes/1.7.12.4.txt b/Documentation/RelNotes/1.7.12.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.12.4.txt rename to Documentation/RelNotes/1.7.12.4.adoc diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.adoc similarity index 100% rename from Documentation/RelNotes/1.7.12.txt rename to Documentation/RelNotes/1.7.12.adoc diff --git a/Documentation/RelNotes/1.7.2.1.txt b/Documentation/RelNotes/1.7.2.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.1.txt rename to Documentation/RelNotes/1.7.2.1.adoc diff --git a/Documentation/RelNotes/1.7.2.2.txt b/Documentation/RelNotes/1.7.2.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.2.txt rename to Documentation/RelNotes/1.7.2.2.adoc diff --git a/Documentation/RelNotes/1.7.2.3.txt b/Documentation/RelNotes/1.7.2.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.3.txt rename to Documentation/RelNotes/1.7.2.3.adoc diff --git a/Documentation/RelNotes/1.7.2.4.txt b/Documentation/RelNotes/1.7.2.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.4.txt rename to Documentation/RelNotes/1.7.2.4.adoc diff --git a/Documentation/RelNotes/1.7.2.5.txt b/Documentation/RelNotes/1.7.2.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.5.txt rename to Documentation/RelNotes/1.7.2.5.adoc diff --git a/Documentation/RelNotes/1.7.2.txt b/Documentation/RelNotes/1.7.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.2.txt rename to Documentation/RelNotes/1.7.2.adoc diff --git a/Documentation/RelNotes/1.7.3.1.txt b/Documentation/RelNotes/1.7.3.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.1.txt rename to Documentation/RelNotes/1.7.3.1.adoc diff --git a/Documentation/RelNotes/1.7.3.2.txt b/Documentation/RelNotes/1.7.3.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.2.txt rename to Documentation/RelNotes/1.7.3.2.adoc diff --git a/Documentation/RelNotes/1.7.3.3.txt b/Documentation/RelNotes/1.7.3.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.3.txt rename to Documentation/RelNotes/1.7.3.3.adoc diff --git a/Documentation/RelNotes/1.7.3.4.txt b/Documentation/RelNotes/1.7.3.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.4.txt rename to Documentation/RelNotes/1.7.3.4.adoc diff --git a/Documentation/RelNotes/1.7.3.5.txt b/Documentation/RelNotes/1.7.3.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.5.txt rename to Documentation/RelNotes/1.7.3.5.adoc diff --git a/Documentation/RelNotes/1.7.3.txt b/Documentation/RelNotes/1.7.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.3.txt rename to Documentation/RelNotes/1.7.3.adoc diff --git a/Documentation/RelNotes/1.7.4.1.txt b/Documentation/RelNotes/1.7.4.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.1.txt rename to Documentation/RelNotes/1.7.4.1.adoc diff --git a/Documentation/RelNotes/1.7.4.2.txt b/Documentation/RelNotes/1.7.4.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.2.txt rename to Documentation/RelNotes/1.7.4.2.adoc diff --git a/Documentation/RelNotes/1.7.4.3.txt b/Documentation/RelNotes/1.7.4.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.3.txt rename to Documentation/RelNotes/1.7.4.3.adoc diff --git a/Documentation/RelNotes/1.7.4.4.txt b/Documentation/RelNotes/1.7.4.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.4.txt rename to Documentation/RelNotes/1.7.4.4.adoc diff --git a/Documentation/RelNotes/1.7.4.5.txt b/Documentation/RelNotes/1.7.4.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.5.txt rename to Documentation/RelNotes/1.7.4.5.adoc diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.4.txt rename to Documentation/RelNotes/1.7.4.adoc diff --git a/Documentation/RelNotes/1.7.5.1.txt b/Documentation/RelNotes/1.7.5.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.5.1.txt rename to Documentation/RelNotes/1.7.5.1.adoc diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.5.2.txt rename to Documentation/RelNotes/1.7.5.2.adoc diff --git a/Documentation/RelNotes/1.7.5.3.txt b/Documentation/RelNotes/1.7.5.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.5.3.txt rename to Documentation/RelNotes/1.7.5.3.adoc diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.5.4.txt rename to Documentation/RelNotes/1.7.5.4.adoc diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.5.txt rename to Documentation/RelNotes/1.7.5.adoc diff --git a/Documentation/RelNotes/1.7.6.1.txt b/Documentation/RelNotes/1.7.6.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.1.txt rename to Documentation/RelNotes/1.7.6.1.adoc diff --git a/Documentation/RelNotes/1.7.6.2.txt b/Documentation/RelNotes/1.7.6.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.2.txt rename to Documentation/RelNotes/1.7.6.2.adoc diff --git a/Documentation/RelNotes/1.7.6.3.txt b/Documentation/RelNotes/1.7.6.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.3.txt rename to Documentation/RelNotes/1.7.6.3.adoc diff --git a/Documentation/RelNotes/1.7.6.4.txt b/Documentation/RelNotes/1.7.6.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.4.txt rename to Documentation/RelNotes/1.7.6.4.adoc diff --git a/Documentation/RelNotes/1.7.6.5.txt b/Documentation/RelNotes/1.7.6.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.5.txt rename to Documentation/RelNotes/1.7.6.5.adoc diff --git a/Documentation/RelNotes/1.7.6.6.txt b/Documentation/RelNotes/1.7.6.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.6.txt rename to Documentation/RelNotes/1.7.6.6.adoc diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.6.txt rename to Documentation/RelNotes/1.7.6.adoc diff --git a/Documentation/RelNotes/1.7.7.1.txt b/Documentation/RelNotes/1.7.7.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.1.txt rename to Documentation/RelNotes/1.7.7.1.adoc diff --git a/Documentation/RelNotes/1.7.7.2.txt b/Documentation/RelNotes/1.7.7.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.2.txt rename to Documentation/RelNotes/1.7.7.2.adoc diff --git a/Documentation/RelNotes/1.7.7.3.txt b/Documentation/RelNotes/1.7.7.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.3.txt rename to Documentation/RelNotes/1.7.7.3.adoc diff --git a/Documentation/RelNotes/1.7.7.4.txt b/Documentation/RelNotes/1.7.7.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.4.txt rename to Documentation/RelNotes/1.7.7.4.adoc diff --git a/Documentation/RelNotes/1.7.7.5.txt b/Documentation/RelNotes/1.7.7.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.5.txt rename to Documentation/RelNotes/1.7.7.5.adoc diff --git a/Documentation/RelNotes/1.7.7.6.txt b/Documentation/RelNotes/1.7.7.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.6.txt rename to Documentation/RelNotes/1.7.7.6.adoc diff --git a/Documentation/RelNotes/1.7.7.7.txt b/Documentation/RelNotes/1.7.7.7.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.7.txt rename to Documentation/RelNotes/1.7.7.7.adoc diff --git a/Documentation/RelNotes/1.7.7.txt b/Documentation/RelNotes/1.7.7.adoc similarity index 100% rename from Documentation/RelNotes/1.7.7.txt rename to Documentation/RelNotes/1.7.7.adoc diff --git a/Documentation/RelNotes/1.7.8.1.txt b/Documentation/RelNotes/1.7.8.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.1.txt rename to Documentation/RelNotes/1.7.8.1.adoc diff --git a/Documentation/RelNotes/1.7.8.2.txt b/Documentation/RelNotes/1.7.8.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.2.txt rename to Documentation/RelNotes/1.7.8.2.adoc diff --git a/Documentation/RelNotes/1.7.8.3.txt b/Documentation/RelNotes/1.7.8.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.3.txt rename to Documentation/RelNotes/1.7.8.3.adoc diff --git a/Documentation/RelNotes/1.7.8.4.txt b/Documentation/RelNotes/1.7.8.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.4.txt rename to Documentation/RelNotes/1.7.8.4.adoc diff --git a/Documentation/RelNotes/1.7.8.5.txt b/Documentation/RelNotes/1.7.8.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.5.txt rename to Documentation/RelNotes/1.7.8.5.adoc diff --git a/Documentation/RelNotes/1.7.8.6.txt b/Documentation/RelNotes/1.7.8.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.6.txt rename to Documentation/RelNotes/1.7.8.6.adoc diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.adoc similarity index 100% rename from Documentation/RelNotes/1.7.8.txt rename to Documentation/RelNotes/1.7.8.adoc diff --git a/Documentation/RelNotes/1.7.9.1.txt b/Documentation/RelNotes/1.7.9.1.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.1.txt rename to Documentation/RelNotes/1.7.9.1.adoc diff --git a/Documentation/RelNotes/1.7.9.2.txt b/Documentation/RelNotes/1.7.9.2.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.2.txt rename to Documentation/RelNotes/1.7.9.2.adoc diff --git a/Documentation/RelNotes/1.7.9.3.txt b/Documentation/RelNotes/1.7.9.3.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.3.txt rename to Documentation/RelNotes/1.7.9.3.adoc diff --git a/Documentation/RelNotes/1.7.9.4.txt b/Documentation/RelNotes/1.7.9.4.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.4.txt rename to Documentation/RelNotes/1.7.9.4.adoc diff --git a/Documentation/RelNotes/1.7.9.5.txt b/Documentation/RelNotes/1.7.9.5.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.5.txt rename to Documentation/RelNotes/1.7.9.5.adoc diff --git a/Documentation/RelNotes/1.7.9.6.txt b/Documentation/RelNotes/1.7.9.6.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.6.txt rename to Documentation/RelNotes/1.7.9.6.adoc diff --git a/Documentation/RelNotes/1.7.9.7.txt b/Documentation/RelNotes/1.7.9.7.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.7.txt rename to Documentation/RelNotes/1.7.9.7.adoc diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.adoc similarity index 100% rename from Documentation/RelNotes/1.7.9.txt rename to Documentation/RelNotes/1.7.9.adoc diff --git a/Documentation/RelNotes/1.8.0.1.txt b/Documentation/RelNotes/1.8.0.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.0.1.txt rename to Documentation/RelNotes/1.8.0.1.adoc diff --git a/Documentation/RelNotes/1.8.0.2.txt b/Documentation/RelNotes/1.8.0.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.0.2.txt rename to Documentation/RelNotes/1.8.0.2.adoc diff --git a/Documentation/RelNotes/1.8.0.3.txt b/Documentation/RelNotes/1.8.0.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.0.3.txt rename to Documentation/RelNotes/1.8.0.3.adoc diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.adoc similarity index 100% rename from Documentation/RelNotes/1.8.0.txt rename to Documentation/RelNotes/1.8.0.adoc diff --git a/Documentation/RelNotes/1.8.1.1.txt b/Documentation/RelNotes/1.8.1.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.1.txt rename to Documentation/RelNotes/1.8.1.1.adoc diff --git a/Documentation/RelNotes/1.8.1.2.txt b/Documentation/RelNotes/1.8.1.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.2.txt rename to Documentation/RelNotes/1.8.1.2.adoc diff --git a/Documentation/RelNotes/1.8.1.3.txt b/Documentation/RelNotes/1.8.1.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.3.txt rename to Documentation/RelNotes/1.8.1.3.adoc diff --git a/Documentation/RelNotes/1.8.1.4.txt b/Documentation/RelNotes/1.8.1.4.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.4.txt rename to Documentation/RelNotes/1.8.1.4.adoc diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.5.txt rename to Documentation/RelNotes/1.8.1.5.adoc diff --git a/Documentation/RelNotes/1.8.1.6.txt b/Documentation/RelNotes/1.8.1.6.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.6.txt rename to Documentation/RelNotes/1.8.1.6.adoc diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.1.txt rename to Documentation/RelNotes/1.8.1.adoc diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.2.1.txt rename to Documentation/RelNotes/1.8.2.1.adoc diff --git a/Documentation/RelNotes/1.8.2.2.txt b/Documentation/RelNotes/1.8.2.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.2.2.txt rename to Documentation/RelNotes/1.8.2.2.adoc diff --git a/Documentation/RelNotes/1.8.2.3.txt b/Documentation/RelNotes/1.8.2.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.2.3.txt rename to Documentation/RelNotes/1.8.2.3.adoc diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.2.txt rename to Documentation/RelNotes/1.8.2.adoc diff --git a/Documentation/RelNotes/1.8.3.1.txt b/Documentation/RelNotes/1.8.3.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.3.1.txt rename to Documentation/RelNotes/1.8.3.1.adoc diff --git a/Documentation/RelNotes/1.8.3.2.txt b/Documentation/RelNotes/1.8.3.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.3.2.txt rename to Documentation/RelNotes/1.8.3.2.adoc diff --git a/Documentation/RelNotes/1.8.3.3.txt b/Documentation/RelNotes/1.8.3.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.3.3.txt rename to Documentation/RelNotes/1.8.3.3.adoc diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.adoc similarity index 100% rename from Documentation/RelNotes/1.8.3.4.txt rename to Documentation/RelNotes/1.8.3.4.adoc diff --git a/Documentation/RelNotes/1.8.3.txt b/Documentation/RelNotes/1.8.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.3.txt rename to Documentation/RelNotes/1.8.3.adoc diff --git a/Documentation/RelNotes/1.8.4.1.txt b/Documentation/RelNotes/1.8.4.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.1.txt rename to Documentation/RelNotes/1.8.4.1.adoc diff --git a/Documentation/RelNotes/1.8.4.2.txt b/Documentation/RelNotes/1.8.4.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.2.txt rename to Documentation/RelNotes/1.8.4.2.adoc diff --git a/Documentation/RelNotes/1.8.4.3.txt b/Documentation/RelNotes/1.8.4.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.3.txt rename to Documentation/RelNotes/1.8.4.3.adoc diff --git a/Documentation/RelNotes/1.8.4.4.txt b/Documentation/RelNotes/1.8.4.4.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.4.txt rename to Documentation/RelNotes/1.8.4.4.adoc diff --git a/Documentation/RelNotes/1.8.4.5.txt b/Documentation/RelNotes/1.8.4.5.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.5.txt rename to Documentation/RelNotes/1.8.4.5.adoc diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.adoc similarity index 100% rename from Documentation/RelNotes/1.8.4.txt rename to Documentation/RelNotes/1.8.4.adoc diff --git a/Documentation/RelNotes/1.8.5.1.txt b/Documentation/RelNotes/1.8.5.1.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.1.txt rename to Documentation/RelNotes/1.8.5.1.adoc diff --git a/Documentation/RelNotes/1.8.5.2.txt b/Documentation/RelNotes/1.8.5.2.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.2.txt rename to Documentation/RelNotes/1.8.5.2.adoc diff --git a/Documentation/RelNotes/1.8.5.3.txt b/Documentation/RelNotes/1.8.5.3.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.3.txt rename to Documentation/RelNotes/1.8.5.3.adoc diff --git a/Documentation/RelNotes/1.8.5.4.txt b/Documentation/RelNotes/1.8.5.4.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.4.txt rename to Documentation/RelNotes/1.8.5.4.adoc diff --git a/Documentation/RelNotes/1.8.5.5.txt b/Documentation/RelNotes/1.8.5.5.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.5.txt rename to Documentation/RelNotes/1.8.5.5.adoc diff --git a/Documentation/RelNotes/1.8.5.6.txt b/Documentation/RelNotes/1.8.5.6.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.6.txt rename to Documentation/RelNotes/1.8.5.6.adoc diff --git a/Documentation/RelNotes/1.8.5.txt b/Documentation/RelNotes/1.8.5.adoc similarity index 100% rename from Documentation/RelNotes/1.8.5.txt rename to Documentation/RelNotes/1.8.5.adoc diff --git a/Documentation/RelNotes/1.9.0.txt b/Documentation/RelNotes/1.9.0.adoc similarity index 100% rename from Documentation/RelNotes/1.9.0.txt rename to Documentation/RelNotes/1.9.0.adoc diff --git a/Documentation/RelNotes/1.9.1.txt b/Documentation/RelNotes/1.9.1.adoc similarity index 100% rename from Documentation/RelNotes/1.9.1.txt rename to Documentation/RelNotes/1.9.1.adoc diff --git a/Documentation/RelNotes/1.9.2.txt b/Documentation/RelNotes/1.9.2.adoc similarity index 100% rename from Documentation/RelNotes/1.9.2.txt rename to Documentation/RelNotes/1.9.2.adoc diff --git a/Documentation/RelNotes/1.9.3.txt b/Documentation/RelNotes/1.9.3.adoc similarity index 100% rename from Documentation/RelNotes/1.9.3.txt rename to Documentation/RelNotes/1.9.3.adoc diff --git a/Documentation/RelNotes/1.9.4.txt b/Documentation/RelNotes/1.9.4.adoc similarity index 100% rename from Documentation/RelNotes/1.9.4.txt rename to Documentation/RelNotes/1.9.4.adoc diff --git a/Documentation/RelNotes/1.9.5.txt b/Documentation/RelNotes/1.9.5.adoc similarity index 100% rename from Documentation/RelNotes/1.9.5.txt rename to Documentation/RelNotes/1.9.5.adoc diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.adoc similarity index 100% rename from Documentation/RelNotes/2.0.0.txt rename to Documentation/RelNotes/2.0.0.adoc diff --git a/Documentation/RelNotes/2.0.1.txt b/Documentation/RelNotes/2.0.1.adoc similarity index 100% rename from Documentation/RelNotes/2.0.1.txt rename to Documentation/RelNotes/2.0.1.adoc diff --git a/Documentation/RelNotes/2.0.2.txt b/Documentation/RelNotes/2.0.2.adoc similarity index 100% rename from Documentation/RelNotes/2.0.2.txt rename to Documentation/RelNotes/2.0.2.adoc diff --git a/Documentation/RelNotes/2.0.3.txt b/Documentation/RelNotes/2.0.3.adoc similarity index 100% rename from Documentation/RelNotes/2.0.3.txt rename to Documentation/RelNotes/2.0.3.adoc diff --git a/Documentation/RelNotes/2.0.4.txt b/Documentation/RelNotes/2.0.4.adoc similarity index 100% rename from Documentation/RelNotes/2.0.4.txt rename to Documentation/RelNotes/2.0.4.adoc diff --git a/Documentation/RelNotes/2.0.5.txt b/Documentation/RelNotes/2.0.5.adoc similarity index 100% rename from Documentation/RelNotes/2.0.5.txt rename to Documentation/RelNotes/2.0.5.adoc diff --git a/Documentation/RelNotes/2.1.0.txt b/Documentation/RelNotes/2.1.0.adoc similarity index 100% rename from Documentation/RelNotes/2.1.0.txt rename to Documentation/RelNotes/2.1.0.adoc diff --git a/Documentation/RelNotes/2.1.1.txt b/Documentation/RelNotes/2.1.1.adoc similarity index 100% rename from Documentation/RelNotes/2.1.1.txt rename to Documentation/RelNotes/2.1.1.adoc diff --git a/Documentation/RelNotes/2.1.2.txt b/Documentation/RelNotes/2.1.2.adoc similarity index 100% rename from Documentation/RelNotes/2.1.2.txt rename to Documentation/RelNotes/2.1.2.adoc diff --git a/Documentation/RelNotes/2.1.3.txt b/Documentation/RelNotes/2.1.3.adoc similarity index 100% rename from Documentation/RelNotes/2.1.3.txt rename to Documentation/RelNotes/2.1.3.adoc diff --git a/Documentation/RelNotes/2.1.4.txt b/Documentation/RelNotes/2.1.4.adoc similarity index 100% rename from Documentation/RelNotes/2.1.4.txt rename to Documentation/RelNotes/2.1.4.adoc diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.adoc similarity index 100% rename from Documentation/RelNotes/2.10.0.txt rename to Documentation/RelNotes/2.10.0.adoc diff --git a/Documentation/RelNotes/2.10.1.txt b/Documentation/RelNotes/2.10.1.adoc similarity index 100% rename from Documentation/RelNotes/2.10.1.txt rename to Documentation/RelNotes/2.10.1.adoc diff --git a/Documentation/RelNotes/2.10.2.txt b/Documentation/RelNotes/2.10.2.adoc similarity index 100% rename from Documentation/RelNotes/2.10.2.txt rename to Documentation/RelNotes/2.10.2.adoc diff --git a/Documentation/RelNotes/2.10.3.txt b/Documentation/RelNotes/2.10.3.adoc similarity index 100% rename from Documentation/RelNotes/2.10.3.txt rename to Documentation/RelNotes/2.10.3.adoc diff --git a/Documentation/RelNotes/2.10.4.txt b/Documentation/RelNotes/2.10.4.adoc similarity index 100% rename from Documentation/RelNotes/2.10.4.txt rename to Documentation/RelNotes/2.10.4.adoc diff --git a/Documentation/RelNotes/2.10.5.txt b/Documentation/RelNotes/2.10.5.adoc similarity index 100% rename from Documentation/RelNotes/2.10.5.txt rename to Documentation/RelNotes/2.10.5.adoc diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.adoc similarity index 100% rename from Documentation/RelNotes/2.11.0.txt rename to Documentation/RelNotes/2.11.0.adoc diff --git a/Documentation/RelNotes/2.11.1.txt b/Documentation/RelNotes/2.11.1.adoc similarity index 100% rename from Documentation/RelNotes/2.11.1.txt rename to Documentation/RelNotes/2.11.1.adoc diff --git a/Documentation/RelNotes/2.11.2.txt b/Documentation/RelNotes/2.11.2.adoc similarity index 100% rename from Documentation/RelNotes/2.11.2.txt rename to Documentation/RelNotes/2.11.2.adoc diff --git a/Documentation/RelNotes/2.11.3.txt b/Documentation/RelNotes/2.11.3.adoc similarity index 100% rename from Documentation/RelNotes/2.11.3.txt rename to Documentation/RelNotes/2.11.3.adoc diff --git a/Documentation/RelNotes/2.11.4.txt b/Documentation/RelNotes/2.11.4.adoc similarity index 100% rename from Documentation/RelNotes/2.11.4.txt rename to Documentation/RelNotes/2.11.4.adoc diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.adoc similarity index 100% rename from Documentation/RelNotes/2.12.0.txt rename to Documentation/RelNotes/2.12.0.adoc diff --git a/Documentation/RelNotes/2.12.1.txt b/Documentation/RelNotes/2.12.1.adoc similarity index 100% rename from Documentation/RelNotes/2.12.1.txt rename to Documentation/RelNotes/2.12.1.adoc diff --git a/Documentation/RelNotes/2.12.2.txt b/Documentation/RelNotes/2.12.2.adoc similarity index 100% rename from Documentation/RelNotes/2.12.2.txt rename to Documentation/RelNotes/2.12.2.adoc diff --git a/Documentation/RelNotes/2.12.3.txt b/Documentation/RelNotes/2.12.3.adoc similarity index 100% rename from Documentation/RelNotes/2.12.3.txt rename to Documentation/RelNotes/2.12.3.adoc diff --git a/Documentation/RelNotes/2.12.4.txt b/Documentation/RelNotes/2.12.4.adoc similarity index 100% rename from Documentation/RelNotes/2.12.4.txt rename to Documentation/RelNotes/2.12.4.adoc diff --git a/Documentation/RelNotes/2.12.5.txt b/Documentation/RelNotes/2.12.5.adoc similarity index 100% rename from Documentation/RelNotes/2.12.5.txt rename to Documentation/RelNotes/2.12.5.adoc diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.adoc similarity index 100% rename from Documentation/RelNotes/2.13.0.txt rename to Documentation/RelNotes/2.13.0.adoc diff --git a/Documentation/RelNotes/2.13.1.txt b/Documentation/RelNotes/2.13.1.adoc similarity index 100% rename from Documentation/RelNotes/2.13.1.txt rename to Documentation/RelNotes/2.13.1.adoc diff --git a/Documentation/RelNotes/2.13.2.txt b/Documentation/RelNotes/2.13.2.adoc similarity index 100% rename from Documentation/RelNotes/2.13.2.txt rename to Documentation/RelNotes/2.13.2.adoc diff --git a/Documentation/RelNotes/2.13.3.txt b/Documentation/RelNotes/2.13.3.adoc similarity index 100% rename from Documentation/RelNotes/2.13.3.txt rename to Documentation/RelNotes/2.13.3.adoc diff --git a/Documentation/RelNotes/2.13.4.txt b/Documentation/RelNotes/2.13.4.adoc similarity index 100% rename from Documentation/RelNotes/2.13.4.txt rename to Documentation/RelNotes/2.13.4.adoc diff --git a/Documentation/RelNotes/2.13.5.txt b/Documentation/RelNotes/2.13.5.adoc similarity index 100% rename from Documentation/RelNotes/2.13.5.txt rename to Documentation/RelNotes/2.13.5.adoc diff --git a/Documentation/RelNotes/2.13.6.txt b/Documentation/RelNotes/2.13.6.adoc similarity index 100% rename from Documentation/RelNotes/2.13.6.txt rename to Documentation/RelNotes/2.13.6.adoc diff --git a/Documentation/RelNotes/2.13.7.txt b/Documentation/RelNotes/2.13.7.adoc similarity index 100% rename from Documentation/RelNotes/2.13.7.txt rename to Documentation/RelNotes/2.13.7.adoc diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.adoc similarity index 100% rename from Documentation/RelNotes/2.14.0.txt rename to Documentation/RelNotes/2.14.0.adoc diff --git a/Documentation/RelNotes/2.14.1.txt b/Documentation/RelNotes/2.14.1.adoc similarity index 100% rename from Documentation/RelNotes/2.14.1.txt rename to Documentation/RelNotes/2.14.1.adoc diff --git a/Documentation/RelNotes/2.14.2.txt b/Documentation/RelNotes/2.14.2.adoc similarity index 100% rename from Documentation/RelNotes/2.14.2.txt rename to Documentation/RelNotes/2.14.2.adoc diff --git a/Documentation/RelNotes/2.14.3.txt b/Documentation/RelNotes/2.14.3.adoc similarity index 100% rename from Documentation/RelNotes/2.14.3.txt rename to Documentation/RelNotes/2.14.3.adoc diff --git a/Documentation/RelNotes/2.14.4.txt b/Documentation/RelNotes/2.14.4.adoc similarity index 100% rename from Documentation/RelNotes/2.14.4.txt rename to Documentation/RelNotes/2.14.4.adoc diff --git a/Documentation/RelNotes/2.14.5.txt b/Documentation/RelNotes/2.14.5.adoc similarity index 100% rename from Documentation/RelNotes/2.14.5.txt rename to Documentation/RelNotes/2.14.5.adoc diff --git a/Documentation/RelNotes/2.14.6.txt b/Documentation/RelNotes/2.14.6.adoc similarity index 100% rename from Documentation/RelNotes/2.14.6.txt rename to Documentation/RelNotes/2.14.6.adoc diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.adoc similarity index 100% rename from Documentation/RelNotes/2.15.0.txt rename to Documentation/RelNotes/2.15.0.adoc diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.adoc similarity index 100% rename from Documentation/RelNotes/2.15.1.txt rename to Documentation/RelNotes/2.15.1.adoc diff --git a/Documentation/RelNotes/2.15.2.txt b/Documentation/RelNotes/2.15.2.adoc similarity index 100% rename from Documentation/RelNotes/2.15.2.txt rename to Documentation/RelNotes/2.15.2.adoc diff --git a/Documentation/RelNotes/2.15.3.txt b/Documentation/RelNotes/2.15.3.adoc similarity index 100% rename from Documentation/RelNotes/2.15.3.txt rename to Documentation/RelNotes/2.15.3.adoc diff --git a/Documentation/RelNotes/2.15.4.txt b/Documentation/RelNotes/2.15.4.adoc similarity index 100% rename from Documentation/RelNotes/2.15.4.txt rename to Documentation/RelNotes/2.15.4.adoc diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.adoc similarity index 100% rename from Documentation/RelNotes/2.16.0.txt rename to Documentation/RelNotes/2.16.0.adoc diff --git a/Documentation/RelNotes/2.16.1.txt b/Documentation/RelNotes/2.16.1.adoc similarity index 100% rename from Documentation/RelNotes/2.16.1.txt rename to Documentation/RelNotes/2.16.1.adoc diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.adoc similarity index 100% rename from Documentation/RelNotes/2.16.2.txt rename to Documentation/RelNotes/2.16.2.adoc diff --git a/Documentation/RelNotes/2.16.3.txt b/Documentation/RelNotes/2.16.3.adoc similarity index 100% rename from Documentation/RelNotes/2.16.3.txt rename to Documentation/RelNotes/2.16.3.adoc diff --git a/Documentation/RelNotes/2.16.4.txt b/Documentation/RelNotes/2.16.4.adoc similarity index 100% rename from Documentation/RelNotes/2.16.4.txt rename to Documentation/RelNotes/2.16.4.adoc diff --git a/Documentation/RelNotes/2.16.5.txt b/Documentation/RelNotes/2.16.5.adoc similarity index 100% rename from Documentation/RelNotes/2.16.5.txt rename to Documentation/RelNotes/2.16.5.adoc diff --git a/Documentation/RelNotes/2.16.6.txt b/Documentation/RelNotes/2.16.6.adoc similarity index 100% rename from Documentation/RelNotes/2.16.6.txt rename to Documentation/RelNotes/2.16.6.adoc diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.adoc similarity index 100% rename from Documentation/RelNotes/2.17.0.txt rename to Documentation/RelNotes/2.17.0.adoc diff --git a/Documentation/RelNotes/2.17.1.txt b/Documentation/RelNotes/2.17.1.adoc similarity index 100% rename from Documentation/RelNotes/2.17.1.txt rename to Documentation/RelNotes/2.17.1.adoc diff --git a/Documentation/RelNotes/2.17.2.txt b/Documentation/RelNotes/2.17.2.adoc similarity index 100% rename from Documentation/RelNotes/2.17.2.txt rename to Documentation/RelNotes/2.17.2.adoc diff --git a/Documentation/RelNotes/2.17.3.txt b/Documentation/RelNotes/2.17.3.adoc similarity index 100% rename from Documentation/RelNotes/2.17.3.txt rename to Documentation/RelNotes/2.17.3.adoc diff --git a/Documentation/RelNotes/2.17.4.txt b/Documentation/RelNotes/2.17.4.adoc similarity index 100% rename from Documentation/RelNotes/2.17.4.txt rename to Documentation/RelNotes/2.17.4.adoc diff --git a/Documentation/RelNotes/2.17.5.txt b/Documentation/RelNotes/2.17.5.adoc similarity index 100% rename from Documentation/RelNotes/2.17.5.txt rename to Documentation/RelNotes/2.17.5.adoc diff --git a/Documentation/RelNotes/2.17.6.txt b/Documentation/RelNotes/2.17.6.adoc similarity index 100% rename from Documentation/RelNotes/2.17.6.txt rename to Documentation/RelNotes/2.17.6.adoc diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.adoc similarity index 100% rename from Documentation/RelNotes/2.18.0.txt rename to Documentation/RelNotes/2.18.0.adoc diff --git a/Documentation/RelNotes/2.18.1.txt b/Documentation/RelNotes/2.18.1.adoc similarity index 100% rename from Documentation/RelNotes/2.18.1.txt rename to Documentation/RelNotes/2.18.1.adoc diff --git a/Documentation/RelNotes/2.18.2.txt b/Documentation/RelNotes/2.18.2.adoc similarity index 100% rename from Documentation/RelNotes/2.18.2.txt rename to Documentation/RelNotes/2.18.2.adoc diff --git a/Documentation/RelNotes/2.18.3.txt b/Documentation/RelNotes/2.18.3.adoc similarity index 100% rename from Documentation/RelNotes/2.18.3.txt rename to Documentation/RelNotes/2.18.3.adoc diff --git a/Documentation/RelNotes/2.18.4.txt b/Documentation/RelNotes/2.18.4.adoc similarity index 100% rename from Documentation/RelNotes/2.18.4.txt rename to Documentation/RelNotes/2.18.4.adoc diff --git a/Documentation/RelNotes/2.18.5.txt b/Documentation/RelNotes/2.18.5.adoc similarity index 100% rename from Documentation/RelNotes/2.18.5.txt rename to Documentation/RelNotes/2.18.5.adoc diff --git a/Documentation/RelNotes/2.19.0.txt b/Documentation/RelNotes/2.19.0.adoc similarity index 100% rename from Documentation/RelNotes/2.19.0.txt rename to Documentation/RelNotes/2.19.0.adoc diff --git a/Documentation/RelNotes/2.19.1.txt b/Documentation/RelNotes/2.19.1.adoc similarity index 100% rename from Documentation/RelNotes/2.19.1.txt rename to Documentation/RelNotes/2.19.1.adoc diff --git a/Documentation/RelNotes/2.19.2.txt b/Documentation/RelNotes/2.19.2.adoc similarity index 100% rename from Documentation/RelNotes/2.19.2.txt rename to Documentation/RelNotes/2.19.2.adoc diff --git a/Documentation/RelNotes/2.19.3.txt b/Documentation/RelNotes/2.19.3.adoc similarity index 100% rename from Documentation/RelNotes/2.19.3.txt rename to Documentation/RelNotes/2.19.3.adoc diff --git a/Documentation/RelNotes/2.19.4.txt b/Documentation/RelNotes/2.19.4.adoc similarity index 100% rename from Documentation/RelNotes/2.19.4.txt rename to Documentation/RelNotes/2.19.4.adoc diff --git a/Documentation/RelNotes/2.19.5.txt b/Documentation/RelNotes/2.19.5.adoc similarity index 100% rename from Documentation/RelNotes/2.19.5.txt rename to Documentation/RelNotes/2.19.5.adoc diff --git a/Documentation/RelNotes/2.19.6.txt b/Documentation/RelNotes/2.19.6.adoc similarity index 100% rename from Documentation/RelNotes/2.19.6.txt rename to Documentation/RelNotes/2.19.6.adoc diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.adoc similarity index 100% rename from Documentation/RelNotes/2.2.0.txt rename to Documentation/RelNotes/2.2.0.adoc diff --git a/Documentation/RelNotes/2.2.1.txt b/Documentation/RelNotes/2.2.1.adoc similarity index 100% rename from Documentation/RelNotes/2.2.1.txt rename to Documentation/RelNotes/2.2.1.adoc diff --git a/Documentation/RelNotes/2.2.2.txt b/Documentation/RelNotes/2.2.2.adoc similarity index 100% rename from Documentation/RelNotes/2.2.2.txt rename to Documentation/RelNotes/2.2.2.adoc diff --git a/Documentation/RelNotes/2.2.3.txt b/Documentation/RelNotes/2.2.3.adoc similarity index 100% rename from Documentation/RelNotes/2.2.3.txt rename to Documentation/RelNotes/2.2.3.adoc diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.adoc similarity index 100% rename from Documentation/RelNotes/2.20.0.txt rename to Documentation/RelNotes/2.20.0.adoc diff --git a/Documentation/RelNotes/2.20.1.txt b/Documentation/RelNotes/2.20.1.adoc similarity index 100% rename from Documentation/RelNotes/2.20.1.txt rename to Documentation/RelNotes/2.20.1.adoc diff --git a/Documentation/RelNotes/2.20.2.txt b/Documentation/RelNotes/2.20.2.adoc similarity index 100% rename from Documentation/RelNotes/2.20.2.txt rename to Documentation/RelNotes/2.20.2.adoc diff --git a/Documentation/RelNotes/2.20.3.txt b/Documentation/RelNotes/2.20.3.adoc similarity index 100% rename from Documentation/RelNotes/2.20.3.txt rename to Documentation/RelNotes/2.20.3.adoc diff --git a/Documentation/RelNotes/2.20.4.txt b/Documentation/RelNotes/2.20.4.adoc similarity index 100% rename from Documentation/RelNotes/2.20.4.txt rename to Documentation/RelNotes/2.20.4.adoc diff --git a/Documentation/RelNotes/2.20.5.txt b/Documentation/RelNotes/2.20.5.adoc similarity index 100% rename from Documentation/RelNotes/2.20.5.txt rename to Documentation/RelNotes/2.20.5.adoc diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.adoc similarity index 100% rename from Documentation/RelNotes/2.21.0.txt rename to Documentation/RelNotes/2.21.0.adoc diff --git a/Documentation/RelNotes/2.21.1.txt b/Documentation/RelNotes/2.21.1.adoc similarity index 100% rename from Documentation/RelNotes/2.21.1.txt rename to Documentation/RelNotes/2.21.1.adoc diff --git a/Documentation/RelNotes/2.21.2.txt b/Documentation/RelNotes/2.21.2.adoc similarity index 100% rename from Documentation/RelNotes/2.21.2.txt rename to Documentation/RelNotes/2.21.2.adoc diff --git a/Documentation/RelNotes/2.21.3.txt b/Documentation/RelNotes/2.21.3.adoc similarity index 100% rename from Documentation/RelNotes/2.21.3.txt rename to Documentation/RelNotes/2.21.3.adoc diff --git a/Documentation/RelNotes/2.21.4.txt b/Documentation/RelNotes/2.21.4.adoc similarity index 100% rename from Documentation/RelNotes/2.21.4.txt rename to Documentation/RelNotes/2.21.4.adoc diff --git a/Documentation/RelNotes/2.22.0.txt b/Documentation/RelNotes/2.22.0.adoc similarity index 100% rename from Documentation/RelNotes/2.22.0.txt rename to Documentation/RelNotes/2.22.0.adoc diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.adoc similarity index 100% rename from Documentation/RelNotes/2.22.1.txt rename to Documentation/RelNotes/2.22.1.adoc diff --git a/Documentation/RelNotes/2.22.2.txt b/Documentation/RelNotes/2.22.2.adoc similarity index 100% rename from Documentation/RelNotes/2.22.2.txt rename to Documentation/RelNotes/2.22.2.adoc diff --git a/Documentation/RelNotes/2.22.3.txt b/Documentation/RelNotes/2.22.3.adoc similarity index 100% rename from Documentation/RelNotes/2.22.3.txt rename to Documentation/RelNotes/2.22.3.adoc diff --git a/Documentation/RelNotes/2.22.4.txt b/Documentation/RelNotes/2.22.4.adoc similarity index 100% rename from Documentation/RelNotes/2.22.4.txt rename to Documentation/RelNotes/2.22.4.adoc diff --git a/Documentation/RelNotes/2.22.5.txt b/Documentation/RelNotes/2.22.5.adoc similarity index 100% rename from Documentation/RelNotes/2.22.5.txt rename to Documentation/RelNotes/2.22.5.adoc diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.adoc similarity index 100% rename from Documentation/RelNotes/2.23.0.txt rename to Documentation/RelNotes/2.23.0.adoc diff --git a/Documentation/RelNotes/2.23.1.txt b/Documentation/RelNotes/2.23.1.adoc similarity index 100% rename from Documentation/RelNotes/2.23.1.txt rename to Documentation/RelNotes/2.23.1.adoc diff --git a/Documentation/RelNotes/2.23.2.txt b/Documentation/RelNotes/2.23.2.adoc similarity index 100% rename from Documentation/RelNotes/2.23.2.txt rename to Documentation/RelNotes/2.23.2.adoc diff --git a/Documentation/RelNotes/2.23.3.txt b/Documentation/RelNotes/2.23.3.adoc similarity index 100% rename from Documentation/RelNotes/2.23.3.txt rename to Documentation/RelNotes/2.23.3.adoc diff --git a/Documentation/RelNotes/2.23.4.txt b/Documentation/RelNotes/2.23.4.adoc similarity index 100% rename from Documentation/RelNotes/2.23.4.txt rename to Documentation/RelNotes/2.23.4.adoc diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.adoc similarity index 100% rename from Documentation/RelNotes/2.24.0.txt rename to Documentation/RelNotes/2.24.0.adoc diff --git a/Documentation/RelNotes/2.24.1.txt b/Documentation/RelNotes/2.24.1.adoc similarity index 100% rename from Documentation/RelNotes/2.24.1.txt rename to Documentation/RelNotes/2.24.1.adoc diff --git a/Documentation/RelNotes/2.24.2.txt b/Documentation/RelNotes/2.24.2.adoc similarity index 100% rename from Documentation/RelNotes/2.24.2.txt rename to Documentation/RelNotes/2.24.2.adoc diff --git a/Documentation/RelNotes/2.24.3.txt b/Documentation/RelNotes/2.24.3.adoc similarity index 100% rename from Documentation/RelNotes/2.24.3.txt rename to Documentation/RelNotes/2.24.3.adoc diff --git a/Documentation/RelNotes/2.24.4.txt b/Documentation/RelNotes/2.24.4.adoc similarity index 100% rename from Documentation/RelNotes/2.24.4.txt rename to Documentation/RelNotes/2.24.4.adoc diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.adoc similarity index 100% rename from Documentation/RelNotes/2.25.0.txt rename to Documentation/RelNotes/2.25.0.adoc diff --git a/Documentation/RelNotes/2.25.1.txt b/Documentation/RelNotes/2.25.1.adoc similarity index 100% rename from Documentation/RelNotes/2.25.1.txt rename to Documentation/RelNotes/2.25.1.adoc diff --git a/Documentation/RelNotes/2.25.2.txt b/Documentation/RelNotes/2.25.2.adoc similarity index 100% rename from Documentation/RelNotes/2.25.2.txt rename to Documentation/RelNotes/2.25.2.adoc diff --git a/Documentation/RelNotes/2.25.3.txt b/Documentation/RelNotes/2.25.3.adoc similarity index 100% rename from Documentation/RelNotes/2.25.3.txt rename to Documentation/RelNotes/2.25.3.adoc diff --git a/Documentation/RelNotes/2.25.4.txt b/Documentation/RelNotes/2.25.4.adoc similarity index 100% rename from Documentation/RelNotes/2.25.4.txt rename to Documentation/RelNotes/2.25.4.adoc diff --git a/Documentation/RelNotes/2.25.5.txt b/Documentation/RelNotes/2.25.5.adoc similarity index 100% rename from Documentation/RelNotes/2.25.5.txt rename to Documentation/RelNotes/2.25.5.adoc diff --git a/Documentation/RelNotes/2.26.0.txt b/Documentation/RelNotes/2.26.0.adoc similarity index 100% rename from Documentation/RelNotes/2.26.0.txt rename to Documentation/RelNotes/2.26.0.adoc diff --git a/Documentation/RelNotes/2.26.1.txt b/Documentation/RelNotes/2.26.1.adoc similarity index 100% rename from Documentation/RelNotes/2.26.1.txt rename to Documentation/RelNotes/2.26.1.adoc diff --git a/Documentation/RelNotes/2.26.2.txt b/Documentation/RelNotes/2.26.2.adoc similarity index 100% rename from Documentation/RelNotes/2.26.2.txt rename to Documentation/RelNotes/2.26.2.adoc diff --git a/Documentation/RelNotes/2.26.3.txt b/Documentation/RelNotes/2.26.3.adoc similarity index 100% rename from Documentation/RelNotes/2.26.3.txt rename to Documentation/RelNotes/2.26.3.adoc diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.adoc similarity index 100% rename from Documentation/RelNotes/2.27.0.txt rename to Documentation/RelNotes/2.27.0.adoc diff --git a/Documentation/RelNotes/2.27.1.txt b/Documentation/RelNotes/2.27.1.adoc similarity index 100% rename from Documentation/RelNotes/2.27.1.txt rename to Documentation/RelNotes/2.27.1.adoc diff --git a/Documentation/RelNotes/2.28.0.txt b/Documentation/RelNotes/2.28.0.adoc similarity index 100% rename from Documentation/RelNotes/2.28.0.txt rename to Documentation/RelNotes/2.28.0.adoc diff --git a/Documentation/RelNotes/2.28.1.txt b/Documentation/RelNotes/2.28.1.adoc similarity index 100% rename from Documentation/RelNotes/2.28.1.txt rename to Documentation/RelNotes/2.28.1.adoc diff --git a/Documentation/RelNotes/2.29.0.txt b/Documentation/RelNotes/2.29.0.adoc similarity index 100% rename from Documentation/RelNotes/2.29.0.txt rename to Documentation/RelNotes/2.29.0.adoc diff --git a/Documentation/RelNotes/2.29.1.txt b/Documentation/RelNotes/2.29.1.adoc similarity index 100% rename from Documentation/RelNotes/2.29.1.txt rename to Documentation/RelNotes/2.29.1.adoc diff --git a/Documentation/RelNotes/2.29.2.txt b/Documentation/RelNotes/2.29.2.adoc similarity index 100% rename from Documentation/RelNotes/2.29.2.txt rename to Documentation/RelNotes/2.29.2.adoc diff --git a/Documentation/RelNotes/2.29.3.txt b/Documentation/RelNotes/2.29.3.adoc similarity index 100% rename from Documentation/RelNotes/2.29.3.txt rename to Documentation/RelNotes/2.29.3.adoc diff --git a/Documentation/RelNotes/2.3.0.txt b/Documentation/RelNotes/2.3.0.adoc similarity index 100% rename from Documentation/RelNotes/2.3.0.txt rename to Documentation/RelNotes/2.3.0.adoc diff --git a/Documentation/RelNotes/2.3.1.txt b/Documentation/RelNotes/2.3.1.adoc similarity index 100% rename from Documentation/RelNotes/2.3.1.txt rename to Documentation/RelNotes/2.3.1.adoc diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.adoc similarity index 100% rename from Documentation/RelNotes/2.3.10.txt rename to Documentation/RelNotes/2.3.10.adoc diff --git a/Documentation/RelNotes/2.3.2.txt b/Documentation/RelNotes/2.3.2.adoc similarity index 100% rename from Documentation/RelNotes/2.3.2.txt rename to Documentation/RelNotes/2.3.2.adoc diff --git a/Documentation/RelNotes/2.3.3.txt b/Documentation/RelNotes/2.3.3.adoc similarity index 100% rename from Documentation/RelNotes/2.3.3.txt rename to Documentation/RelNotes/2.3.3.adoc diff --git a/Documentation/RelNotes/2.3.4.txt b/Documentation/RelNotes/2.3.4.adoc similarity index 100% rename from Documentation/RelNotes/2.3.4.txt rename to Documentation/RelNotes/2.3.4.adoc diff --git a/Documentation/RelNotes/2.3.5.txt b/Documentation/RelNotes/2.3.5.adoc similarity index 100% rename from Documentation/RelNotes/2.3.5.txt rename to Documentation/RelNotes/2.3.5.adoc diff --git a/Documentation/RelNotes/2.3.6.txt b/Documentation/RelNotes/2.3.6.adoc similarity index 100% rename from Documentation/RelNotes/2.3.6.txt rename to Documentation/RelNotes/2.3.6.adoc diff --git a/Documentation/RelNotes/2.3.7.txt b/Documentation/RelNotes/2.3.7.adoc similarity index 100% rename from Documentation/RelNotes/2.3.7.txt rename to Documentation/RelNotes/2.3.7.adoc diff --git a/Documentation/RelNotes/2.3.8.txt b/Documentation/RelNotes/2.3.8.adoc similarity index 100% rename from Documentation/RelNotes/2.3.8.txt rename to Documentation/RelNotes/2.3.8.adoc diff --git a/Documentation/RelNotes/2.3.9.txt b/Documentation/RelNotes/2.3.9.adoc similarity index 100% rename from Documentation/RelNotes/2.3.9.txt rename to Documentation/RelNotes/2.3.9.adoc diff --git a/Documentation/RelNotes/2.30.0.txt b/Documentation/RelNotes/2.30.0.adoc similarity index 100% rename from Documentation/RelNotes/2.30.0.txt rename to Documentation/RelNotes/2.30.0.adoc diff --git a/Documentation/RelNotes/2.30.1.txt b/Documentation/RelNotes/2.30.1.adoc similarity index 100% rename from Documentation/RelNotes/2.30.1.txt rename to Documentation/RelNotes/2.30.1.adoc diff --git a/Documentation/RelNotes/2.30.2.txt b/Documentation/RelNotes/2.30.2.adoc similarity index 100% rename from Documentation/RelNotes/2.30.2.txt rename to Documentation/RelNotes/2.30.2.adoc diff --git a/Documentation/RelNotes/2.30.3.txt b/Documentation/RelNotes/2.30.3.adoc similarity index 100% rename from Documentation/RelNotes/2.30.3.txt rename to Documentation/RelNotes/2.30.3.adoc diff --git a/Documentation/RelNotes/2.30.4.txt b/Documentation/RelNotes/2.30.4.adoc similarity index 100% rename from Documentation/RelNotes/2.30.4.txt rename to Documentation/RelNotes/2.30.4.adoc diff --git a/Documentation/RelNotes/2.30.5.txt b/Documentation/RelNotes/2.30.5.adoc similarity index 100% rename from Documentation/RelNotes/2.30.5.txt rename to Documentation/RelNotes/2.30.5.adoc diff --git a/Documentation/RelNotes/2.30.6.txt b/Documentation/RelNotes/2.30.6.adoc similarity index 100% rename from Documentation/RelNotes/2.30.6.txt rename to Documentation/RelNotes/2.30.6.adoc diff --git a/Documentation/RelNotes/2.30.7.txt b/Documentation/RelNotes/2.30.7.adoc similarity index 100% rename from Documentation/RelNotes/2.30.7.txt rename to Documentation/RelNotes/2.30.7.adoc diff --git a/Documentation/RelNotes/2.30.8.txt b/Documentation/RelNotes/2.30.8.adoc similarity index 100% rename from Documentation/RelNotes/2.30.8.txt rename to Documentation/RelNotes/2.30.8.adoc diff --git a/Documentation/RelNotes/2.30.9.txt b/Documentation/RelNotes/2.30.9.adoc similarity index 100% rename from Documentation/RelNotes/2.30.9.txt rename to Documentation/RelNotes/2.30.9.adoc diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.adoc similarity index 100% rename from Documentation/RelNotes/2.31.0.txt rename to Documentation/RelNotes/2.31.0.adoc diff --git a/Documentation/RelNotes/2.31.1.txt b/Documentation/RelNotes/2.31.1.adoc similarity index 100% rename from Documentation/RelNotes/2.31.1.txt rename to Documentation/RelNotes/2.31.1.adoc diff --git a/Documentation/RelNotes/2.31.2.txt b/Documentation/RelNotes/2.31.2.adoc similarity index 100% rename from Documentation/RelNotes/2.31.2.txt rename to Documentation/RelNotes/2.31.2.adoc diff --git a/Documentation/RelNotes/2.31.3.txt b/Documentation/RelNotes/2.31.3.adoc similarity index 100% rename from Documentation/RelNotes/2.31.3.txt rename to Documentation/RelNotes/2.31.3.adoc diff --git a/Documentation/RelNotes/2.31.4.txt b/Documentation/RelNotes/2.31.4.adoc similarity index 100% rename from Documentation/RelNotes/2.31.4.txt rename to Documentation/RelNotes/2.31.4.adoc diff --git a/Documentation/RelNotes/2.31.5.txt b/Documentation/RelNotes/2.31.5.adoc similarity index 100% rename from Documentation/RelNotes/2.31.5.txt rename to Documentation/RelNotes/2.31.5.adoc diff --git a/Documentation/RelNotes/2.31.6.txt b/Documentation/RelNotes/2.31.6.adoc similarity index 100% rename from Documentation/RelNotes/2.31.6.txt rename to Documentation/RelNotes/2.31.6.adoc diff --git a/Documentation/RelNotes/2.31.7.txt b/Documentation/RelNotes/2.31.7.adoc similarity index 100% rename from Documentation/RelNotes/2.31.7.txt rename to Documentation/RelNotes/2.31.7.adoc diff --git a/Documentation/RelNotes/2.31.8.txt b/Documentation/RelNotes/2.31.8.adoc similarity index 100% rename from Documentation/RelNotes/2.31.8.txt rename to Documentation/RelNotes/2.31.8.adoc diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.adoc similarity index 100% rename from Documentation/RelNotes/2.32.0.txt rename to Documentation/RelNotes/2.32.0.adoc diff --git a/Documentation/RelNotes/2.32.1.txt b/Documentation/RelNotes/2.32.1.adoc similarity index 100% rename from Documentation/RelNotes/2.32.1.txt rename to Documentation/RelNotes/2.32.1.adoc diff --git a/Documentation/RelNotes/2.32.2.txt b/Documentation/RelNotes/2.32.2.adoc similarity index 100% rename from Documentation/RelNotes/2.32.2.txt rename to Documentation/RelNotes/2.32.2.adoc diff --git a/Documentation/RelNotes/2.32.3.txt b/Documentation/RelNotes/2.32.3.adoc similarity index 100% rename from Documentation/RelNotes/2.32.3.txt rename to Documentation/RelNotes/2.32.3.adoc diff --git a/Documentation/RelNotes/2.32.4.txt b/Documentation/RelNotes/2.32.4.adoc similarity index 100% rename from Documentation/RelNotes/2.32.4.txt rename to Documentation/RelNotes/2.32.4.adoc diff --git a/Documentation/RelNotes/2.32.5.txt b/Documentation/RelNotes/2.32.5.adoc similarity index 100% rename from Documentation/RelNotes/2.32.5.txt rename to Documentation/RelNotes/2.32.5.adoc diff --git a/Documentation/RelNotes/2.32.6.txt b/Documentation/RelNotes/2.32.6.adoc similarity index 100% rename from Documentation/RelNotes/2.32.6.txt rename to Documentation/RelNotes/2.32.6.adoc diff --git a/Documentation/RelNotes/2.32.7.txt b/Documentation/RelNotes/2.32.7.adoc similarity index 100% rename from Documentation/RelNotes/2.32.7.txt rename to Documentation/RelNotes/2.32.7.adoc diff --git a/Documentation/RelNotes/2.33.0.txt b/Documentation/RelNotes/2.33.0.adoc similarity index 100% rename from Documentation/RelNotes/2.33.0.txt rename to Documentation/RelNotes/2.33.0.adoc diff --git a/Documentation/RelNotes/2.33.1.txt b/Documentation/RelNotes/2.33.1.adoc similarity index 100% rename from Documentation/RelNotes/2.33.1.txt rename to Documentation/RelNotes/2.33.1.adoc diff --git a/Documentation/RelNotes/2.33.2.txt b/Documentation/RelNotes/2.33.2.adoc similarity index 100% rename from Documentation/RelNotes/2.33.2.txt rename to Documentation/RelNotes/2.33.2.adoc diff --git a/Documentation/RelNotes/2.33.3.txt b/Documentation/RelNotes/2.33.3.adoc similarity index 100% rename from Documentation/RelNotes/2.33.3.txt rename to Documentation/RelNotes/2.33.3.adoc diff --git a/Documentation/RelNotes/2.33.4.txt b/Documentation/RelNotes/2.33.4.adoc similarity index 100% rename from Documentation/RelNotes/2.33.4.txt rename to Documentation/RelNotes/2.33.4.adoc diff --git a/Documentation/RelNotes/2.33.5.txt b/Documentation/RelNotes/2.33.5.adoc similarity index 100% rename from Documentation/RelNotes/2.33.5.txt rename to Documentation/RelNotes/2.33.5.adoc diff --git a/Documentation/RelNotes/2.33.6.txt b/Documentation/RelNotes/2.33.6.adoc similarity index 100% rename from Documentation/RelNotes/2.33.6.txt rename to Documentation/RelNotes/2.33.6.adoc diff --git a/Documentation/RelNotes/2.33.7.txt b/Documentation/RelNotes/2.33.7.adoc similarity index 100% rename from Documentation/RelNotes/2.33.7.txt rename to Documentation/RelNotes/2.33.7.adoc diff --git a/Documentation/RelNotes/2.33.8.txt b/Documentation/RelNotes/2.33.8.adoc similarity index 100% rename from Documentation/RelNotes/2.33.8.txt rename to Documentation/RelNotes/2.33.8.adoc diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.adoc similarity index 100% rename from Documentation/RelNotes/2.34.0.txt rename to Documentation/RelNotes/2.34.0.adoc diff --git a/Documentation/RelNotes/2.34.1.txt b/Documentation/RelNotes/2.34.1.adoc similarity index 100% rename from Documentation/RelNotes/2.34.1.txt rename to Documentation/RelNotes/2.34.1.adoc diff --git a/Documentation/RelNotes/2.34.2.txt b/Documentation/RelNotes/2.34.2.adoc similarity index 100% rename from Documentation/RelNotes/2.34.2.txt rename to Documentation/RelNotes/2.34.2.adoc diff --git a/Documentation/RelNotes/2.34.3.txt b/Documentation/RelNotes/2.34.3.adoc similarity index 100% rename from Documentation/RelNotes/2.34.3.txt rename to Documentation/RelNotes/2.34.3.adoc diff --git a/Documentation/RelNotes/2.34.4.txt b/Documentation/RelNotes/2.34.4.adoc similarity index 100% rename from Documentation/RelNotes/2.34.4.txt rename to Documentation/RelNotes/2.34.4.adoc diff --git a/Documentation/RelNotes/2.34.5.txt b/Documentation/RelNotes/2.34.5.adoc similarity index 100% rename from Documentation/RelNotes/2.34.5.txt rename to Documentation/RelNotes/2.34.5.adoc diff --git a/Documentation/RelNotes/2.34.6.txt b/Documentation/RelNotes/2.34.6.adoc similarity index 100% rename from Documentation/RelNotes/2.34.6.txt rename to Documentation/RelNotes/2.34.6.adoc diff --git a/Documentation/RelNotes/2.34.7.txt b/Documentation/RelNotes/2.34.7.adoc similarity index 100% rename from Documentation/RelNotes/2.34.7.txt rename to Documentation/RelNotes/2.34.7.adoc diff --git a/Documentation/RelNotes/2.34.8.txt b/Documentation/RelNotes/2.34.8.adoc similarity index 100% rename from Documentation/RelNotes/2.34.8.txt rename to Documentation/RelNotes/2.34.8.adoc diff --git a/Documentation/RelNotes/2.35.0.txt b/Documentation/RelNotes/2.35.0.adoc similarity index 100% rename from Documentation/RelNotes/2.35.0.txt rename to Documentation/RelNotes/2.35.0.adoc diff --git a/Documentation/RelNotes/2.35.1.txt b/Documentation/RelNotes/2.35.1.adoc similarity index 100% rename from Documentation/RelNotes/2.35.1.txt rename to Documentation/RelNotes/2.35.1.adoc diff --git a/Documentation/RelNotes/2.35.2.txt b/Documentation/RelNotes/2.35.2.adoc similarity index 100% rename from Documentation/RelNotes/2.35.2.txt rename to Documentation/RelNotes/2.35.2.adoc diff --git a/Documentation/RelNotes/2.35.3.txt b/Documentation/RelNotes/2.35.3.adoc similarity index 100% rename from Documentation/RelNotes/2.35.3.txt rename to Documentation/RelNotes/2.35.3.adoc diff --git a/Documentation/RelNotes/2.35.4.txt b/Documentation/RelNotes/2.35.4.adoc similarity index 100% rename from Documentation/RelNotes/2.35.4.txt rename to Documentation/RelNotes/2.35.4.adoc diff --git a/Documentation/RelNotes/2.35.5.txt b/Documentation/RelNotes/2.35.5.adoc similarity index 100% rename from Documentation/RelNotes/2.35.5.txt rename to Documentation/RelNotes/2.35.5.adoc diff --git a/Documentation/RelNotes/2.35.6.txt b/Documentation/RelNotes/2.35.6.adoc similarity index 100% rename from Documentation/RelNotes/2.35.6.txt rename to Documentation/RelNotes/2.35.6.adoc diff --git a/Documentation/RelNotes/2.35.7.txt b/Documentation/RelNotes/2.35.7.adoc similarity index 100% rename from Documentation/RelNotes/2.35.7.txt rename to Documentation/RelNotes/2.35.7.adoc diff --git a/Documentation/RelNotes/2.35.8.txt b/Documentation/RelNotes/2.35.8.adoc similarity index 100% rename from Documentation/RelNotes/2.35.8.txt rename to Documentation/RelNotes/2.35.8.adoc diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.adoc similarity index 100% rename from Documentation/RelNotes/2.36.0.txt rename to Documentation/RelNotes/2.36.0.adoc diff --git a/Documentation/RelNotes/2.36.1.txt b/Documentation/RelNotes/2.36.1.adoc similarity index 100% rename from Documentation/RelNotes/2.36.1.txt rename to Documentation/RelNotes/2.36.1.adoc diff --git a/Documentation/RelNotes/2.36.2.txt b/Documentation/RelNotes/2.36.2.adoc similarity index 100% rename from Documentation/RelNotes/2.36.2.txt rename to Documentation/RelNotes/2.36.2.adoc diff --git a/Documentation/RelNotes/2.36.3.txt b/Documentation/RelNotes/2.36.3.adoc similarity index 100% rename from Documentation/RelNotes/2.36.3.txt rename to Documentation/RelNotes/2.36.3.adoc diff --git a/Documentation/RelNotes/2.36.4.txt b/Documentation/RelNotes/2.36.4.adoc similarity index 100% rename from Documentation/RelNotes/2.36.4.txt rename to Documentation/RelNotes/2.36.4.adoc diff --git a/Documentation/RelNotes/2.36.5.txt b/Documentation/RelNotes/2.36.5.adoc similarity index 100% rename from Documentation/RelNotes/2.36.5.txt rename to Documentation/RelNotes/2.36.5.adoc diff --git a/Documentation/RelNotes/2.36.6.txt b/Documentation/RelNotes/2.36.6.adoc similarity index 100% rename from Documentation/RelNotes/2.36.6.txt rename to Documentation/RelNotes/2.36.6.adoc diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.adoc similarity index 100% rename from Documentation/RelNotes/2.37.0.txt rename to Documentation/RelNotes/2.37.0.adoc diff --git a/Documentation/RelNotes/2.37.1.txt b/Documentation/RelNotes/2.37.1.adoc similarity index 100% rename from Documentation/RelNotes/2.37.1.txt rename to Documentation/RelNotes/2.37.1.adoc diff --git a/Documentation/RelNotes/2.37.2.txt b/Documentation/RelNotes/2.37.2.adoc similarity index 100% rename from Documentation/RelNotes/2.37.2.txt rename to Documentation/RelNotes/2.37.2.adoc diff --git a/Documentation/RelNotes/2.37.3.txt b/Documentation/RelNotes/2.37.3.adoc similarity index 100% rename from Documentation/RelNotes/2.37.3.txt rename to Documentation/RelNotes/2.37.3.adoc diff --git a/Documentation/RelNotes/2.37.4.txt b/Documentation/RelNotes/2.37.4.adoc similarity index 100% rename from Documentation/RelNotes/2.37.4.txt rename to Documentation/RelNotes/2.37.4.adoc diff --git a/Documentation/RelNotes/2.37.5.txt b/Documentation/RelNotes/2.37.5.adoc similarity index 100% rename from Documentation/RelNotes/2.37.5.txt rename to Documentation/RelNotes/2.37.5.adoc diff --git a/Documentation/RelNotes/2.37.6.txt b/Documentation/RelNotes/2.37.6.adoc similarity index 100% rename from Documentation/RelNotes/2.37.6.txt rename to Documentation/RelNotes/2.37.6.adoc diff --git a/Documentation/RelNotes/2.37.7.txt b/Documentation/RelNotes/2.37.7.adoc similarity index 100% rename from Documentation/RelNotes/2.37.7.txt rename to Documentation/RelNotes/2.37.7.adoc diff --git a/Documentation/RelNotes/2.38.0.txt b/Documentation/RelNotes/2.38.0.adoc similarity index 100% rename from Documentation/RelNotes/2.38.0.txt rename to Documentation/RelNotes/2.38.0.adoc diff --git a/Documentation/RelNotes/2.38.1.txt b/Documentation/RelNotes/2.38.1.adoc similarity index 100% rename from Documentation/RelNotes/2.38.1.txt rename to Documentation/RelNotes/2.38.1.adoc diff --git a/Documentation/RelNotes/2.38.2.txt b/Documentation/RelNotes/2.38.2.adoc similarity index 100% rename from Documentation/RelNotes/2.38.2.txt rename to Documentation/RelNotes/2.38.2.adoc diff --git a/Documentation/RelNotes/2.38.3.txt b/Documentation/RelNotes/2.38.3.adoc similarity index 100% rename from Documentation/RelNotes/2.38.3.txt rename to Documentation/RelNotes/2.38.3.adoc diff --git a/Documentation/RelNotes/2.38.4.txt b/Documentation/RelNotes/2.38.4.adoc similarity index 100% rename from Documentation/RelNotes/2.38.4.txt rename to Documentation/RelNotes/2.38.4.adoc diff --git a/Documentation/RelNotes/2.38.5.txt b/Documentation/RelNotes/2.38.5.adoc similarity index 100% rename from Documentation/RelNotes/2.38.5.txt rename to Documentation/RelNotes/2.38.5.adoc diff --git a/Documentation/RelNotes/2.39.0.txt b/Documentation/RelNotes/2.39.0.adoc similarity index 100% rename from Documentation/RelNotes/2.39.0.txt rename to Documentation/RelNotes/2.39.0.adoc diff --git a/Documentation/RelNotes/2.39.1.txt b/Documentation/RelNotes/2.39.1.adoc similarity index 100% rename from Documentation/RelNotes/2.39.1.txt rename to Documentation/RelNotes/2.39.1.adoc diff --git a/Documentation/RelNotes/2.39.2.txt b/Documentation/RelNotes/2.39.2.adoc similarity index 100% rename from Documentation/RelNotes/2.39.2.txt rename to Documentation/RelNotes/2.39.2.adoc diff --git a/Documentation/RelNotes/2.39.3.txt b/Documentation/RelNotes/2.39.3.adoc similarity index 100% rename from Documentation/RelNotes/2.39.3.txt rename to Documentation/RelNotes/2.39.3.adoc diff --git a/Documentation/RelNotes/2.39.4.txt b/Documentation/RelNotes/2.39.4.adoc similarity index 100% rename from Documentation/RelNotes/2.39.4.txt rename to Documentation/RelNotes/2.39.4.adoc diff --git a/Documentation/RelNotes/2.39.5.txt b/Documentation/RelNotes/2.39.5.adoc similarity index 100% rename from Documentation/RelNotes/2.39.5.txt rename to Documentation/RelNotes/2.39.5.adoc diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.adoc similarity index 100% rename from Documentation/RelNotes/2.4.0.txt rename to Documentation/RelNotes/2.4.0.adoc diff --git a/Documentation/RelNotes/2.4.1.txt b/Documentation/RelNotes/2.4.1.adoc similarity index 100% rename from Documentation/RelNotes/2.4.1.txt rename to Documentation/RelNotes/2.4.1.adoc diff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.adoc similarity index 100% rename from Documentation/RelNotes/2.4.10.txt rename to Documentation/RelNotes/2.4.10.adoc diff --git a/Documentation/RelNotes/2.4.11.txt b/Documentation/RelNotes/2.4.11.adoc similarity index 100% rename from Documentation/RelNotes/2.4.11.txt rename to Documentation/RelNotes/2.4.11.adoc diff --git a/Documentation/RelNotes/2.4.12.txt b/Documentation/RelNotes/2.4.12.adoc similarity index 100% rename from Documentation/RelNotes/2.4.12.txt rename to Documentation/RelNotes/2.4.12.adoc diff --git a/Documentation/RelNotes/2.4.2.txt b/Documentation/RelNotes/2.4.2.adoc similarity index 100% rename from Documentation/RelNotes/2.4.2.txt rename to Documentation/RelNotes/2.4.2.adoc diff --git a/Documentation/RelNotes/2.4.3.txt b/Documentation/RelNotes/2.4.3.adoc similarity index 100% rename from Documentation/RelNotes/2.4.3.txt rename to Documentation/RelNotes/2.4.3.adoc diff --git a/Documentation/RelNotes/2.4.4.txt b/Documentation/RelNotes/2.4.4.adoc similarity index 100% rename from Documentation/RelNotes/2.4.4.txt rename to Documentation/RelNotes/2.4.4.adoc diff --git a/Documentation/RelNotes/2.4.5.txt b/Documentation/RelNotes/2.4.5.adoc similarity index 100% rename from Documentation/RelNotes/2.4.5.txt rename to Documentation/RelNotes/2.4.5.adoc diff --git a/Documentation/RelNotes/2.4.6.txt b/Documentation/RelNotes/2.4.6.adoc similarity index 100% rename from Documentation/RelNotes/2.4.6.txt rename to Documentation/RelNotes/2.4.6.adoc diff --git a/Documentation/RelNotes/2.4.7.txt b/Documentation/RelNotes/2.4.7.adoc similarity index 100% rename from Documentation/RelNotes/2.4.7.txt rename to Documentation/RelNotes/2.4.7.adoc diff --git a/Documentation/RelNotes/2.4.8.txt b/Documentation/RelNotes/2.4.8.adoc similarity index 100% rename from Documentation/RelNotes/2.4.8.txt rename to Documentation/RelNotes/2.4.8.adoc diff --git a/Documentation/RelNotes/2.4.9.txt b/Documentation/RelNotes/2.4.9.adoc similarity index 100% rename from Documentation/RelNotes/2.4.9.txt rename to Documentation/RelNotes/2.4.9.adoc diff --git a/Documentation/RelNotes/2.40.0.txt b/Documentation/RelNotes/2.40.0.adoc similarity index 100% rename from Documentation/RelNotes/2.40.0.txt rename to Documentation/RelNotes/2.40.0.adoc diff --git a/Documentation/RelNotes/2.40.1.txt b/Documentation/RelNotes/2.40.1.adoc similarity index 100% rename from Documentation/RelNotes/2.40.1.txt rename to Documentation/RelNotes/2.40.1.adoc diff --git a/Documentation/RelNotes/2.40.2.txt b/Documentation/RelNotes/2.40.2.adoc similarity index 100% rename from Documentation/RelNotes/2.40.2.txt rename to Documentation/RelNotes/2.40.2.adoc diff --git a/Documentation/RelNotes/2.40.3.txt b/Documentation/RelNotes/2.40.3.adoc similarity index 100% rename from Documentation/RelNotes/2.40.3.txt rename to Documentation/RelNotes/2.40.3.adoc diff --git a/Documentation/RelNotes/2.40.4.txt b/Documentation/RelNotes/2.40.4.adoc similarity index 100% rename from Documentation/RelNotes/2.40.4.txt rename to Documentation/RelNotes/2.40.4.adoc diff --git a/Documentation/RelNotes/2.41.0.txt b/Documentation/RelNotes/2.41.0.adoc similarity index 100% rename from Documentation/RelNotes/2.41.0.txt rename to Documentation/RelNotes/2.41.0.adoc diff --git a/Documentation/RelNotes/2.41.1.txt b/Documentation/RelNotes/2.41.1.adoc similarity index 100% rename from Documentation/RelNotes/2.41.1.txt rename to Documentation/RelNotes/2.41.1.adoc diff --git a/Documentation/RelNotes/2.41.2.txt b/Documentation/RelNotes/2.41.2.adoc similarity index 100% rename from Documentation/RelNotes/2.41.2.txt rename to Documentation/RelNotes/2.41.2.adoc diff --git a/Documentation/RelNotes/2.41.3.txt b/Documentation/RelNotes/2.41.3.adoc similarity index 100% rename from Documentation/RelNotes/2.41.3.txt rename to Documentation/RelNotes/2.41.3.adoc diff --git a/Documentation/RelNotes/2.42.0.txt b/Documentation/RelNotes/2.42.0.adoc similarity index 100% rename from Documentation/RelNotes/2.42.0.txt rename to Documentation/RelNotes/2.42.0.adoc diff --git a/Documentation/RelNotes/2.42.1.txt b/Documentation/RelNotes/2.42.1.adoc similarity index 100% rename from Documentation/RelNotes/2.42.1.txt rename to Documentation/RelNotes/2.42.1.adoc diff --git a/Documentation/RelNotes/2.42.2.txt b/Documentation/RelNotes/2.42.2.adoc similarity index 100% rename from Documentation/RelNotes/2.42.2.txt rename to Documentation/RelNotes/2.42.2.adoc diff --git a/Documentation/RelNotes/2.42.3.txt b/Documentation/RelNotes/2.42.3.adoc similarity index 100% rename from Documentation/RelNotes/2.42.3.txt rename to Documentation/RelNotes/2.42.3.adoc diff --git a/Documentation/RelNotes/2.42.4.txt b/Documentation/RelNotes/2.42.4.adoc similarity index 100% rename from Documentation/RelNotes/2.42.4.txt rename to Documentation/RelNotes/2.42.4.adoc diff --git a/Documentation/RelNotes/2.43.0.txt b/Documentation/RelNotes/2.43.0.adoc similarity index 100% rename from Documentation/RelNotes/2.43.0.txt rename to Documentation/RelNotes/2.43.0.adoc diff --git a/Documentation/RelNotes/2.43.1.txt b/Documentation/RelNotes/2.43.1.adoc similarity index 100% rename from Documentation/RelNotes/2.43.1.txt rename to Documentation/RelNotes/2.43.1.adoc diff --git a/Documentation/RelNotes/2.43.2.txt b/Documentation/RelNotes/2.43.2.adoc similarity index 100% rename from Documentation/RelNotes/2.43.2.txt rename to Documentation/RelNotes/2.43.2.adoc diff --git a/Documentation/RelNotes/2.43.3.txt b/Documentation/RelNotes/2.43.3.adoc similarity index 100% rename from Documentation/RelNotes/2.43.3.txt rename to Documentation/RelNotes/2.43.3.adoc diff --git a/Documentation/RelNotes/2.43.4.txt b/Documentation/RelNotes/2.43.4.adoc similarity index 100% rename from Documentation/RelNotes/2.43.4.txt rename to Documentation/RelNotes/2.43.4.adoc diff --git a/Documentation/RelNotes/2.43.5.txt b/Documentation/RelNotes/2.43.5.adoc similarity index 100% rename from Documentation/RelNotes/2.43.5.txt rename to Documentation/RelNotes/2.43.5.adoc diff --git a/Documentation/RelNotes/2.43.6.txt b/Documentation/RelNotes/2.43.6.adoc similarity index 100% rename from Documentation/RelNotes/2.43.6.txt rename to Documentation/RelNotes/2.43.6.adoc diff --git a/Documentation/RelNotes/2.44.0.txt b/Documentation/RelNotes/2.44.0.adoc similarity index 100% rename from Documentation/RelNotes/2.44.0.txt rename to Documentation/RelNotes/2.44.0.adoc diff --git a/Documentation/RelNotes/2.44.1.txt b/Documentation/RelNotes/2.44.1.adoc similarity index 100% rename from Documentation/RelNotes/2.44.1.txt rename to Documentation/RelNotes/2.44.1.adoc diff --git a/Documentation/RelNotes/2.44.2.txt b/Documentation/RelNotes/2.44.2.adoc similarity index 100% rename from Documentation/RelNotes/2.44.2.txt rename to Documentation/RelNotes/2.44.2.adoc diff --git a/Documentation/RelNotes/2.44.3.txt b/Documentation/RelNotes/2.44.3.adoc similarity index 100% rename from Documentation/RelNotes/2.44.3.txt rename to Documentation/RelNotes/2.44.3.adoc diff --git a/Documentation/RelNotes/2.45.0.txt b/Documentation/RelNotes/2.45.0.adoc similarity index 100% rename from Documentation/RelNotes/2.45.0.txt rename to Documentation/RelNotes/2.45.0.adoc diff --git a/Documentation/RelNotes/2.45.1.txt b/Documentation/RelNotes/2.45.1.adoc similarity index 100% rename from Documentation/RelNotes/2.45.1.txt rename to Documentation/RelNotes/2.45.1.adoc diff --git a/Documentation/RelNotes/2.45.2.txt b/Documentation/RelNotes/2.45.2.adoc similarity index 100% rename from Documentation/RelNotes/2.45.2.txt rename to Documentation/RelNotes/2.45.2.adoc diff --git a/Documentation/RelNotes/2.45.3.txt b/Documentation/RelNotes/2.45.3.adoc similarity index 100% rename from Documentation/RelNotes/2.45.3.txt rename to Documentation/RelNotes/2.45.3.adoc diff --git a/Documentation/RelNotes/2.46.0.txt b/Documentation/RelNotes/2.46.0.adoc similarity index 100% rename from Documentation/RelNotes/2.46.0.txt rename to Documentation/RelNotes/2.46.0.adoc diff --git a/Documentation/RelNotes/2.46.1.txt b/Documentation/RelNotes/2.46.1.adoc similarity index 100% rename from Documentation/RelNotes/2.46.1.txt rename to Documentation/RelNotes/2.46.1.adoc diff --git a/Documentation/RelNotes/2.46.2.txt b/Documentation/RelNotes/2.46.2.adoc similarity index 100% rename from Documentation/RelNotes/2.46.2.txt rename to Documentation/RelNotes/2.46.2.adoc diff --git a/Documentation/RelNotes/2.46.3.txt b/Documentation/RelNotes/2.46.3.adoc similarity index 100% rename from Documentation/RelNotes/2.46.3.txt rename to Documentation/RelNotes/2.46.3.adoc diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.adoc similarity index 100% rename from Documentation/RelNotes/2.47.0.txt rename to Documentation/RelNotes/2.47.0.adoc diff --git a/Documentation/RelNotes/2.47.1.txt b/Documentation/RelNotes/2.47.1.adoc similarity index 100% rename from Documentation/RelNotes/2.47.1.txt rename to Documentation/RelNotes/2.47.1.adoc diff --git a/Documentation/RelNotes/2.47.2.txt b/Documentation/RelNotes/2.47.2.adoc similarity index 100% rename from Documentation/RelNotes/2.47.2.txt rename to Documentation/RelNotes/2.47.2.adoc diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.adoc similarity index 100% rename from Documentation/RelNotes/2.48.0.txt rename to Documentation/RelNotes/2.48.0.adoc diff --git a/Documentation/RelNotes/2.48.1.txt b/Documentation/RelNotes/2.48.1.adoc similarity index 100% rename from Documentation/RelNotes/2.48.1.txt rename to Documentation/RelNotes/2.48.1.adoc diff --git a/Documentation/RelNotes/2.49.0.txt b/Documentation/RelNotes/2.49.0.adoc similarity index 100% rename from Documentation/RelNotes/2.49.0.txt rename to Documentation/RelNotes/2.49.0.adoc diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.adoc similarity index 100% rename from Documentation/RelNotes/2.5.0.txt rename to Documentation/RelNotes/2.5.0.adoc diff --git a/Documentation/RelNotes/2.5.1.txt b/Documentation/RelNotes/2.5.1.adoc similarity index 100% rename from Documentation/RelNotes/2.5.1.txt rename to Documentation/RelNotes/2.5.1.adoc diff --git a/Documentation/RelNotes/2.5.2.txt b/Documentation/RelNotes/2.5.2.adoc similarity index 100% rename from Documentation/RelNotes/2.5.2.txt rename to Documentation/RelNotes/2.5.2.adoc diff --git a/Documentation/RelNotes/2.5.3.txt b/Documentation/RelNotes/2.5.3.adoc similarity index 100% rename from Documentation/RelNotes/2.5.3.txt rename to Documentation/RelNotes/2.5.3.adoc diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.adoc similarity index 100% rename from Documentation/RelNotes/2.5.4.txt rename to Documentation/RelNotes/2.5.4.adoc diff --git a/Documentation/RelNotes/2.5.5.txt b/Documentation/RelNotes/2.5.5.adoc similarity index 100% rename from Documentation/RelNotes/2.5.5.txt rename to Documentation/RelNotes/2.5.5.adoc diff --git a/Documentation/RelNotes/2.5.6.txt b/Documentation/RelNotes/2.5.6.adoc similarity index 100% rename from Documentation/RelNotes/2.5.6.txt rename to Documentation/RelNotes/2.5.6.adoc diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.adoc similarity index 100% rename from Documentation/RelNotes/2.6.0.txt rename to Documentation/RelNotes/2.6.0.adoc diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.adoc similarity index 100% rename from Documentation/RelNotes/2.6.1.txt rename to Documentation/RelNotes/2.6.1.adoc diff --git a/Documentation/RelNotes/2.6.2.txt b/Documentation/RelNotes/2.6.2.adoc similarity index 100% rename from Documentation/RelNotes/2.6.2.txt rename to Documentation/RelNotes/2.6.2.adoc diff --git a/Documentation/RelNotes/2.6.3.txt b/Documentation/RelNotes/2.6.3.adoc similarity index 100% rename from Documentation/RelNotes/2.6.3.txt rename to Documentation/RelNotes/2.6.3.adoc diff --git a/Documentation/RelNotes/2.6.4.txt b/Documentation/RelNotes/2.6.4.adoc similarity index 100% rename from Documentation/RelNotes/2.6.4.txt rename to Documentation/RelNotes/2.6.4.adoc diff --git a/Documentation/RelNotes/2.6.5.txt b/Documentation/RelNotes/2.6.5.adoc similarity index 100% rename from Documentation/RelNotes/2.6.5.txt rename to Documentation/RelNotes/2.6.5.adoc diff --git a/Documentation/RelNotes/2.6.6.txt b/Documentation/RelNotes/2.6.6.adoc similarity index 100% rename from Documentation/RelNotes/2.6.6.txt rename to Documentation/RelNotes/2.6.6.adoc diff --git a/Documentation/RelNotes/2.6.7.txt b/Documentation/RelNotes/2.6.7.adoc similarity index 100% rename from Documentation/RelNotes/2.6.7.txt rename to Documentation/RelNotes/2.6.7.adoc diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.adoc similarity index 100% rename from Documentation/RelNotes/2.7.0.txt rename to Documentation/RelNotes/2.7.0.adoc diff --git a/Documentation/RelNotes/2.7.1.txt b/Documentation/RelNotes/2.7.1.adoc similarity index 100% rename from Documentation/RelNotes/2.7.1.txt rename to Documentation/RelNotes/2.7.1.adoc diff --git a/Documentation/RelNotes/2.7.2.txt b/Documentation/RelNotes/2.7.2.adoc similarity index 100% rename from Documentation/RelNotes/2.7.2.txt rename to Documentation/RelNotes/2.7.2.adoc diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.adoc similarity index 100% rename from Documentation/RelNotes/2.7.3.txt rename to Documentation/RelNotes/2.7.3.adoc diff --git a/Documentation/RelNotes/2.7.4.txt b/Documentation/RelNotes/2.7.4.adoc similarity index 100% rename from Documentation/RelNotes/2.7.4.txt rename to Documentation/RelNotes/2.7.4.adoc diff --git a/Documentation/RelNotes/2.7.5.txt b/Documentation/RelNotes/2.7.5.adoc similarity index 100% rename from Documentation/RelNotes/2.7.5.txt rename to Documentation/RelNotes/2.7.5.adoc diff --git a/Documentation/RelNotes/2.7.6.txt b/Documentation/RelNotes/2.7.6.adoc similarity index 100% rename from Documentation/RelNotes/2.7.6.txt rename to Documentation/RelNotes/2.7.6.adoc diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.adoc similarity index 100% rename from Documentation/RelNotes/2.8.0.txt rename to Documentation/RelNotes/2.8.0.adoc diff --git a/Documentation/RelNotes/2.8.1.txt b/Documentation/RelNotes/2.8.1.adoc similarity index 100% rename from Documentation/RelNotes/2.8.1.txt rename to Documentation/RelNotes/2.8.1.adoc diff --git a/Documentation/RelNotes/2.8.2.txt b/Documentation/RelNotes/2.8.2.adoc similarity index 100% rename from Documentation/RelNotes/2.8.2.txt rename to Documentation/RelNotes/2.8.2.adoc diff --git a/Documentation/RelNotes/2.8.3.txt b/Documentation/RelNotes/2.8.3.adoc similarity index 100% rename from Documentation/RelNotes/2.8.3.txt rename to Documentation/RelNotes/2.8.3.adoc diff --git a/Documentation/RelNotes/2.8.4.txt b/Documentation/RelNotes/2.8.4.adoc similarity index 100% rename from Documentation/RelNotes/2.8.4.txt rename to Documentation/RelNotes/2.8.4.adoc diff --git a/Documentation/RelNotes/2.8.5.txt b/Documentation/RelNotes/2.8.5.adoc similarity index 100% rename from Documentation/RelNotes/2.8.5.txt rename to Documentation/RelNotes/2.8.5.adoc diff --git a/Documentation/RelNotes/2.8.6.txt b/Documentation/RelNotes/2.8.6.adoc similarity index 100% rename from Documentation/RelNotes/2.8.6.txt rename to Documentation/RelNotes/2.8.6.adoc diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.adoc similarity index 100% rename from Documentation/RelNotes/2.9.0.txt rename to Documentation/RelNotes/2.9.0.adoc diff --git a/Documentation/RelNotes/2.9.1.txt b/Documentation/RelNotes/2.9.1.adoc similarity index 100% rename from Documentation/RelNotes/2.9.1.txt rename to Documentation/RelNotes/2.9.1.adoc diff --git a/Documentation/RelNotes/2.9.2.txt b/Documentation/RelNotes/2.9.2.adoc similarity index 100% rename from Documentation/RelNotes/2.9.2.txt rename to Documentation/RelNotes/2.9.2.adoc diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.adoc similarity index 100% rename from Documentation/RelNotes/2.9.3.txt rename to Documentation/RelNotes/2.9.3.adoc diff --git a/Documentation/RelNotes/2.9.4.txt b/Documentation/RelNotes/2.9.4.adoc similarity index 100% rename from Documentation/RelNotes/2.9.4.txt rename to Documentation/RelNotes/2.9.4.adoc diff --git a/Documentation/RelNotes/2.9.5.txt b/Documentation/RelNotes/2.9.5.adoc similarity index 100% rename from Documentation/RelNotes/2.9.5.txt rename to Documentation/RelNotes/2.9.5.adoc diff --git a/Documentation/ReviewingGuidelines.txt b/Documentation/ReviewingGuidelines.adoc similarity index 100% rename from Documentation/ReviewingGuidelines.txt rename to Documentation/ReviewingGuidelines.adoc diff --git a/Documentation/ToolsForGit.txt b/Documentation/ToolsForGit.adoc similarity index 100% rename from Documentation/ToolsForGit.txt rename to Documentation/ToolsForGit.adoc diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.adoc similarity index 99% rename from Documentation/blame-options.txt rename to Documentation/blame-options.adoc index 552dcc60f2a..aa77406d4ef 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.adoc @@ -18,7 +18,7 @@ '' and '' are optional. `-L ` or `-L ,` spans from '' to end of file. `-L ,` spans from start of file to ''. + -include::line-range-format.txt[] +include::line-range-format.adoc[] -l:: Show long rev (Default: off). diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl index e260a989774..0a0c1b3f611 100755 --- a/Documentation/cmd-list.perl +++ b/Documentation/cmd-list.perl @@ -5,11 +5,11 @@ sub format_one { my ($source_dir, $out, $nameattr) = @_; my ($name, $attr) = @$nameattr; - my ($path) = "$source_dir/Documentation/$name.txt"; + my ($path) = "$source_dir/Documentation/$name.adoc"; my ($state, $description); my $mansection; $state = 0; - open I, '<', "$path" or die "No such file $path.txt"; + open I, '<', "$path" or die "No such file $path.adoc"; while () { if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) { $mansection = $1; @@ -30,7 +30,7 @@ sub format_one { } close I; if (!defined $description) { - die "No description found in $path.txt"; + die "No description found in $path.adoc"; } if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) { print $out "linkgit:$name\[$mansection\]::\n\t"; @@ -63,7 +63,7 @@ sub format_one { close IN; for my $out (@categories) { - my ($cat) = $out =~ /^cmds-(.*)\.txt$/; + my ($cat) = $out =~ /^cmds-(.*)\.adoc$/; my ($path) = "$build_dir/$out"; open O, '>', "$path+" or die "Cannot open output file $out+"; for (@{$cmds{$cat}}) { diff --git a/Documentation/config.txt b/Documentation/config.adoc similarity index 84% rename from Documentation/config.txt rename to Documentation/config.adoc index 8c0b3ed8075..812b43c43d8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.adoc @@ -372,186 +372,186 @@ inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation. -include::config/add.txt[] +include::config/add.adoc[] -include::config/advice.txt[] +include::config/advice.adoc[] -include::config/alias.txt[] +include::config/alias.adoc[] -include::config/am.txt[] +include::config/am.adoc[] -include::config/apply.txt[] +include::config/apply.adoc[] -include::config/attr.txt[] +include::config/attr.adoc[] -include::config/bitmap-pseudo-merge.txt[] +include::config/bitmap-pseudo-merge.adoc[] -include::config/blame.txt[] +include::config/blame.adoc[] -include::config/branch.txt[] +include::config/branch.adoc[] -include::config/browser.txt[] +include::config/browser.adoc[] -include::config/bundle.txt[] +include::config/bundle.adoc[] -include::config/checkout.txt[] +include::config/checkout.adoc[] -include::config/clean.txt[] +include::config/clean.adoc[] -include::config/clone.txt[] +include::config/clone.adoc[] -include::config/color.txt[] +include::config/color.adoc[] -include::config/column.txt[] +include::config/column.adoc[] -include::config/commit.txt[] +include::config/commit.adoc[] -include::config/commitgraph.txt[] +include::config/commitgraph.adoc[] -include::config/completion.txt[] +include::config/completion.adoc[] -include::config/core.txt[] +include::config/core.adoc[] -include::config/credential.txt[] +include::config/credential.adoc[] -include::config/diff.txt[] +include::config/diff.adoc[] -include::config/difftool.txt[] +include::config/difftool.adoc[] -include::config/extensions.txt[] +include::config/extensions.adoc[] -include::config/fastimport.txt[] +include::config/fastimport.adoc[] -include::config/feature.txt[] +include::config/feature.adoc[] -include::config/fetch.txt[] +include::config/fetch.adoc[] -include::config/filter.txt[] +include::config/filter.adoc[] -include::config/format.txt[] +include::config/format.adoc[] -include::config/fsck.txt[] +include::config/fsck.adoc[] -include::config/fsmonitor--daemon.txt[] +include::config/fsmonitor--daemon.adoc[] -include::config/gc.txt[] +include::config/gc.adoc[] -include::config/gitcvs.txt[] +include::config/gitcvs.adoc[] -include::config/gitweb.txt[] +include::config/gitweb.adoc[] -include::config/gpg.txt[] +include::config/gpg.adoc[] -include::config/grep.txt[] +include::config/grep.adoc[] -include::config/gui.txt[] +include::config/gui.adoc[] -include::config/guitool.txt[] +include::config/guitool.adoc[] -include::config/help.txt[] +include::config/help.adoc[] -include::config/http.txt[] +include::config/http.adoc[] -include::config/i18n.txt[] +include::config/i18n.adoc[] -include::config/imap.txt[] +include::config/imap.adoc[] -include::config/includeif.txt[] +include::config/includeif.adoc[] -include::config/index.txt[] +include::config/index.adoc[] -include::config/init.txt[] +include::config/init.adoc[] -include::config/instaweb.txt[] +include::config/instaweb.adoc[] -include::config/interactive.txt[] +include::config/interactive.adoc[] -include::config/log.txt[] +include::config/log.adoc[] -include::config/lsrefs.txt[] +include::config/lsrefs.adoc[] -include::config/mailinfo.txt[] +include::config/mailinfo.adoc[] -include::config/mailmap.txt[] +include::config/mailmap.adoc[] -include::config/maintenance.txt[] +include::config/maintenance.adoc[] -include::config/man.txt[] +include::config/man.adoc[] -include::config/merge.txt[] +include::config/merge.adoc[] -include::config/mergetool.txt[] +include::config/mergetool.adoc[] -include::config/notes.txt[] +include::config/notes.adoc[] -include::config/pack.txt[] +include::config/pack.adoc[] -include::config/pager.txt[] +include::config/pager.adoc[] -include::config/pretty.txt[] +include::config/pretty.adoc[] -include::config/promisor.txt[] +include::config/promisor.adoc[] -include::config/protocol.txt[] +include::config/protocol.adoc[] -include::config/pull.txt[] +include::config/pull.adoc[] -include::config/push.txt[] +include::config/push.adoc[] -include::config/rebase.txt[] +include::config/rebase.adoc[] -include::config/receive.txt[] +include::config/receive.adoc[] -include::config/reftable.txt[] +include::config/reftable.adoc[] -include::config/remote.txt[] +include::config/remote.adoc[] -include::config/remotes.txt[] +include::config/remotes.adoc[] -include::config/repack.txt[] +include::config/repack.adoc[] -include::config/rerere.txt[] +include::config/rerere.adoc[] -include::config/revert.txt[] +include::config/revert.adoc[] -include::config/safe.txt[] +include::config/safe.adoc[] -include::config/sendemail.txt[] +include::config/sendemail.adoc[] -include::config/sequencer.txt[] +include::config/sequencer.adoc[] -include::config/showbranch.txt[] +include::config/showbranch.adoc[] -include::config/sparse.txt[] +include::config/sparse.adoc[] -include::config/splitindex.txt[] +include::config/splitindex.adoc[] -include::config/ssh.txt[] +include::config/ssh.adoc[] -include::config/stash.txt[] +include::config/stash.adoc[] -include::config/status.txt[] +include::config/status.adoc[] -include::config/submodule.txt[] +include::config/submodule.adoc[] -include::config/tag.txt[] +include::config/tag.adoc[] -include::config/tar.txt[] +include::config/tar.adoc[] -include::config/trace2.txt[] +include::config/trace2.adoc[] -include::config/transfer.txt[] +include::config/transfer.adoc[] -include::config/uploadarchive.txt[] +include::config/uploadarchive.adoc[] -include::config/uploadpack.txt[] +include::config/uploadpack.adoc[] -include::config/url.txt[] +include::config/url.adoc[] -include::config/user.txt[] +include::config/user.adoc[] -include::config/versionsort.txt[] +include::config/versionsort.adoc[] -include::config/web.txt[] +include::config/web.adoc[] -include::config/worktree.txt[] +include::config/worktree.adoc[] diff --git a/Documentation/config/add.txt b/Documentation/config/add.adoc similarity index 100% rename from Documentation/config/add.txt rename to Documentation/config/add.adoc diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.adoc similarity index 100% rename from Documentation/config/advice.txt rename to Documentation/config/advice.adoc diff --git a/Documentation/config/alias.txt b/Documentation/config/alias.adoc similarity index 100% rename from Documentation/config/alias.txt rename to Documentation/config/alias.adoc diff --git a/Documentation/config/am.txt b/Documentation/config/am.adoc similarity index 100% rename from Documentation/config/am.txt rename to Documentation/config/am.adoc diff --git a/Documentation/config/apply.txt b/Documentation/config/apply.adoc similarity index 100% rename from Documentation/config/apply.txt rename to Documentation/config/apply.adoc diff --git a/Documentation/config/attr.txt b/Documentation/config/attr.adoc similarity index 100% rename from Documentation/config/attr.txt rename to Documentation/config/attr.adoc diff --git a/Documentation/config/bitmap-pseudo-merge.txt b/Documentation/config/bitmap-pseudo-merge.adoc similarity index 100% rename from Documentation/config/bitmap-pseudo-merge.txt rename to Documentation/config/bitmap-pseudo-merge.adoc diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.adoc similarity index 100% rename from Documentation/config/blame.txt rename to Documentation/config/blame.adoc diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.adoc similarity index 100% rename from Documentation/config/branch.txt rename to Documentation/config/branch.adoc diff --git a/Documentation/config/browser.txt b/Documentation/config/browser.adoc similarity index 100% rename from Documentation/config/browser.txt rename to Documentation/config/browser.adoc diff --git a/Documentation/config/bundle.txt b/Documentation/config/bundle.adoc similarity index 100% rename from Documentation/config/bundle.txt rename to Documentation/config/bundle.adoc diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.adoc similarity index 100% rename from Documentation/config/checkout.txt rename to Documentation/config/checkout.adoc diff --git a/Documentation/config/clean.txt b/Documentation/config/clean.adoc similarity index 100% rename from Documentation/config/clean.txt rename to Documentation/config/clean.adoc diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.adoc similarity index 100% rename from Documentation/config/clone.txt rename to Documentation/config/clone.adoc diff --git a/Documentation/config/color.txt b/Documentation/config/color.adoc similarity index 100% rename from Documentation/config/color.txt rename to Documentation/config/color.adoc diff --git a/Documentation/config/column.txt b/Documentation/config/column.adoc similarity index 100% rename from Documentation/config/column.txt rename to Documentation/config/column.adoc diff --git a/Documentation/config/commit.txt b/Documentation/config/commit.adoc similarity index 100% rename from Documentation/config/commit.txt rename to Documentation/config/commit.adoc diff --git a/Documentation/config/commitgraph.txt b/Documentation/config/commitgraph.adoc similarity index 100% rename from Documentation/config/commitgraph.txt rename to Documentation/config/commitgraph.adoc diff --git a/Documentation/config/completion.txt b/Documentation/config/completion.adoc similarity index 100% rename from Documentation/config/completion.txt rename to Documentation/config/completion.adoc diff --git a/Documentation/config/core.txt b/Documentation/config/core.adoc similarity index 100% rename from Documentation/config/core.txt rename to Documentation/config/core.adoc diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.adoc similarity index 100% rename from Documentation/config/credential.txt rename to Documentation/config/credential.adoc diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.adoc similarity index 99% rename from Documentation/config/diff.txt rename to Documentation/config/diff.adoc index fdae13a2122..b35be318612 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.adoc @@ -218,7 +218,7 @@ endif::git-diff[] Set this option to `true` to make the diff driver cache the text conversion outputs. See linkgit:gitattributes[5] for details. -include::{build_dir}/mergetools-diff.txt[] +include::{build_dir}/mergetools-diff.adoc[] `diff.indentHeuristic`:: Set this option to `false` to disable the default heuristics diff --git a/Documentation/config/difftool.txt b/Documentation/config/difftool.adoc similarity index 100% rename from Documentation/config/difftool.txt rename to Documentation/config/difftool.adoc diff --git a/Documentation/config/extensions.txt b/Documentation/config/extensions.adoc similarity index 99% rename from Documentation/config/extensions.txt rename to Documentation/config/extensions.adoc index 5cb4721a0e0..9e2f321a6d7 100644 --- a/Documentation/config/extensions.txt +++ b/Documentation/config/extensions.adoc @@ -56,7 +56,7 @@ For historical reasons, this extension is respected regardless of the refStorage:: Specify the ref storage format to use. The acceptable values are: + -include::../ref-storage-format.txt[] +include::../ref-storage-format.adoc[] + Note that this setting should only be set by linkgit:git-init[1] or diff --git a/Documentation/config/fastimport.txt b/Documentation/config/fastimport.adoc similarity index 100% rename from Documentation/config/fastimport.txt rename to Documentation/config/fastimport.adoc diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.adoc similarity index 100% rename from Documentation/config/feature.txt rename to Documentation/config/feature.adoc diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.adoc similarity index 100% rename from Documentation/config/fetch.txt rename to Documentation/config/fetch.adoc diff --git a/Documentation/config/filter.txt b/Documentation/config/filter.adoc similarity index 100% rename from Documentation/config/filter.txt rename to Documentation/config/filter.adoc diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.adoc similarity index 100% rename from Documentation/config/fmt-merge-msg.txt rename to Documentation/config/fmt-merge-msg.adoc diff --git a/Documentation/config/format.txt b/Documentation/config/format.adoc similarity index 100% rename from Documentation/config/format.txt rename to Documentation/config/format.adoc diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.adoc similarity index 100% rename from Documentation/config/fsck.txt rename to Documentation/config/fsck.adoc diff --git a/Documentation/config/fsmonitor--daemon.txt b/Documentation/config/fsmonitor--daemon.adoc similarity index 100% rename from Documentation/config/fsmonitor--daemon.txt rename to Documentation/config/fsmonitor--daemon.adoc diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.adoc similarity index 100% rename from Documentation/config/gc.txt rename to Documentation/config/gc.adoc diff --git a/Documentation/config/gitcvs.txt b/Documentation/config/gitcvs.adoc similarity index 100% rename from Documentation/config/gitcvs.txt rename to Documentation/config/gitcvs.adoc diff --git a/Documentation/config/gitweb.txt b/Documentation/config/gitweb.adoc similarity index 100% rename from Documentation/config/gitweb.txt rename to Documentation/config/gitweb.adoc diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.adoc similarity index 100% rename from Documentation/config/gpg.txt rename to Documentation/config/gpg.adoc diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.adoc similarity index 100% rename from Documentation/config/grep.txt rename to Documentation/config/grep.adoc diff --git a/Documentation/config/gui.txt b/Documentation/config/gui.adoc similarity index 100% rename from Documentation/config/gui.txt rename to Documentation/config/gui.adoc diff --git a/Documentation/config/guitool.txt b/Documentation/config/guitool.adoc similarity index 100% rename from Documentation/config/guitool.txt rename to Documentation/config/guitool.adoc diff --git a/Documentation/config/help.txt b/Documentation/config/help.adoc similarity index 100% rename from Documentation/config/help.txt rename to Documentation/config/help.adoc diff --git a/Documentation/config/http.txt b/Documentation/config/http.adoc similarity index 100% rename from Documentation/config/http.txt rename to Documentation/config/http.adoc diff --git a/Documentation/config/i18n.txt b/Documentation/config/i18n.adoc similarity index 100% rename from Documentation/config/i18n.txt rename to Documentation/config/i18n.adoc diff --git a/Documentation/config/imap.txt b/Documentation/config/imap.adoc similarity index 100% rename from Documentation/config/imap.txt rename to Documentation/config/imap.adoc diff --git a/Documentation/config/includeif.txt b/Documentation/config/includeif.adoc similarity index 100% rename from Documentation/config/includeif.txt rename to Documentation/config/includeif.adoc diff --git a/Documentation/config/index.txt b/Documentation/config/index.adoc similarity index 100% rename from Documentation/config/index.txt rename to Documentation/config/index.adoc diff --git a/Documentation/config/init.txt b/Documentation/config/init.adoc similarity index 100% rename from Documentation/config/init.txt rename to Documentation/config/init.adoc diff --git a/Documentation/config/instaweb.txt b/Documentation/config/instaweb.adoc similarity index 100% rename from Documentation/config/instaweb.txt rename to Documentation/config/instaweb.adoc diff --git a/Documentation/config/interactive.txt b/Documentation/config/interactive.adoc similarity index 100% rename from Documentation/config/interactive.txt rename to Documentation/config/interactive.adoc diff --git a/Documentation/config/log.txt b/Documentation/config/log.adoc similarity index 100% rename from Documentation/config/log.txt rename to Documentation/config/log.adoc diff --git a/Documentation/config/lsrefs.txt b/Documentation/config/lsrefs.adoc similarity index 100% rename from Documentation/config/lsrefs.txt rename to Documentation/config/lsrefs.adoc diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.adoc similarity index 100% rename from Documentation/config/mailinfo.txt rename to Documentation/config/mailinfo.adoc diff --git a/Documentation/config/mailmap.txt b/Documentation/config/mailmap.adoc similarity index 100% rename from Documentation/config/mailmap.txt rename to Documentation/config/mailmap.adoc diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.adoc similarity index 100% rename from Documentation/config/maintenance.txt rename to Documentation/config/maintenance.adoc diff --git a/Documentation/config/man.txt b/Documentation/config/man.adoc similarity index 100% rename from Documentation/config/man.txt rename to Documentation/config/man.adoc diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.adoc similarity index 98% rename from Documentation/config/merge.txt rename to Documentation/config/merge.adoc index 82554d65a0a..857de5b40b9 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.adoc @@ -37,7 +37,7 @@ merge.verifySignatures:: If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details. -include::fmt-merge-msg.txt[] +include::fmt-merge-msg.adoc[] merge.renameLimit:: The number of files to consider in the exhaustive portion of @@ -101,7 +101,7 @@ merge.guitool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined. -include::{build_dir}/mergetools-merge.txt[] +include::{build_dir}/mergetools-merge.adoc[] merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.adoc similarity index 100% rename from Documentation/config/mergetool.txt rename to Documentation/config/mergetool.adoc diff --git a/Documentation/config/notes.txt b/Documentation/config/notes.adoc similarity index 100% rename from Documentation/config/notes.txt rename to Documentation/config/notes.adoc diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.adoc similarity index 100% rename from Documentation/config/pack.txt rename to Documentation/config/pack.adoc diff --git a/Documentation/config/pager.txt b/Documentation/config/pager.adoc similarity index 100% rename from Documentation/config/pager.txt rename to Documentation/config/pager.adoc diff --git a/Documentation/config/pretty.txt b/Documentation/config/pretty.adoc similarity index 100% rename from Documentation/config/pretty.txt rename to Documentation/config/pretty.adoc diff --git a/Documentation/config/promisor.txt b/Documentation/config/promisor.adoc similarity index 100% rename from Documentation/config/promisor.txt rename to Documentation/config/promisor.adoc diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.adoc similarity index 100% rename from Documentation/config/protocol.txt rename to Documentation/config/protocol.adoc diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.adoc similarity index 100% rename from Documentation/config/pull.txt rename to Documentation/config/pull.adoc diff --git a/Documentation/config/push.txt b/Documentation/config/push.adoc similarity index 100% rename from Documentation/config/push.txt rename to Documentation/config/push.adoc diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.adoc similarity index 100% rename from Documentation/config/rebase.txt rename to Documentation/config/rebase.adoc diff --git a/Documentation/config/receive.txt b/Documentation/config/receive.adoc similarity index 100% rename from Documentation/config/receive.txt rename to Documentation/config/receive.adoc diff --git a/Documentation/config/reftable.txt b/Documentation/config/reftable.adoc similarity index 100% rename from Documentation/config/reftable.txt rename to Documentation/config/reftable.adoc diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.adoc similarity index 100% rename from Documentation/config/remote.txt rename to Documentation/config/remote.adoc diff --git a/Documentation/config/remotes.txt b/Documentation/config/remotes.adoc similarity index 100% rename from Documentation/config/remotes.txt rename to Documentation/config/remotes.adoc diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.adoc similarity index 100% rename from Documentation/config/repack.txt rename to Documentation/config/repack.adoc diff --git a/Documentation/config/rerere.txt b/Documentation/config/rerere.adoc similarity index 100% rename from Documentation/config/rerere.txt rename to Documentation/config/rerere.adoc diff --git a/Documentation/config/revert.txt b/Documentation/config/revert.adoc similarity index 100% rename from Documentation/config/revert.txt rename to Documentation/config/revert.adoc diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.adoc similarity index 100% rename from Documentation/config/safe.txt rename to Documentation/config/safe.adoc diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.adoc similarity index 100% rename from Documentation/config/sendemail.txt rename to Documentation/config/sendemail.adoc diff --git a/Documentation/config/sequencer.txt b/Documentation/config/sequencer.adoc similarity index 100% rename from Documentation/config/sequencer.txt rename to Documentation/config/sequencer.adoc diff --git a/Documentation/config/showbranch.txt b/Documentation/config/showbranch.adoc similarity index 100% rename from Documentation/config/showbranch.txt rename to Documentation/config/showbranch.adoc diff --git a/Documentation/config/sparse.txt b/Documentation/config/sparse.adoc similarity index 100% rename from Documentation/config/sparse.txt rename to Documentation/config/sparse.adoc diff --git a/Documentation/config/splitindex.txt b/Documentation/config/splitindex.adoc similarity index 100% rename from Documentation/config/splitindex.txt rename to Documentation/config/splitindex.adoc diff --git a/Documentation/config/ssh.txt b/Documentation/config/ssh.adoc similarity index 100% rename from Documentation/config/ssh.txt rename to Documentation/config/ssh.adoc diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.adoc similarity index 100% rename from Documentation/config/stash.txt rename to Documentation/config/stash.adoc diff --git a/Documentation/config/status.txt b/Documentation/config/status.adoc similarity index 100% rename from Documentation/config/status.txt rename to Documentation/config/status.adoc diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.adoc similarity index 100% rename from Documentation/config/submodule.txt rename to Documentation/config/submodule.adoc diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.adoc similarity index 100% rename from Documentation/config/tag.txt rename to Documentation/config/tag.adoc diff --git a/Documentation/config/tar.txt b/Documentation/config/tar.adoc similarity index 100% rename from Documentation/config/tar.txt rename to Documentation/config/tar.adoc diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.adoc similarity index 98% rename from Documentation/config/trace2.txt rename to Documentation/config/trace2.adoc index 3b6bca2b7ae..05639ce33f9 100644 --- a/Documentation/config/trace2.txt +++ b/Documentation/config/trace2.adoc @@ -17,7 +17,7 @@ trace2.eventTarget:: It may be overridden by the `GIT_TRACE2_EVENT` environment variable. The following table shows possible values. + -include::../trace2-target-values.txt[] +include::../trace2-target-values.adoc[] trace2.normalBrief:: Boolean. When true `time`, `filename`, and `line` fields are diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.adoc similarity index 100% rename from Documentation/config/transfer.txt rename to Documentation/config/transfer.adoc diff --git a/Documentation/config/uploadarchive.txt b/Documentation/config/uploadarchive.adoc similarity index 100% rename from Documentation/config/uploadarchive.txt rename to Documentation/config/uploadarchive.adoc diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.adoc similarity index 100% rename from Documentation/config/uploadpack.txt rename to Documentation/config/uploadpack.adoc diff --git a/Documentation/config/url.txt b/Documentation/config/url.adoc similarity index 100% rename from Documentation/config/url.txt rename to Documentation/config/url.adoc diff --git a/Documentation/config/user.txt b/Documentation/config/user.adoc similarity index 100% rename from Documentation/config/user.txt rename to Documentation/config/user.adoc diff --git a/Documentation/config/versionsort.txt b/Documentation/config/versionsort.adoc similarity index 100% rename from Documentation/config/versionsort.txt rename to Documentation/config/versionsort.adoc diff --git a/Documentation/config/web.txt b/Documentation/config/web.adoc similarity index 100% rename from Documentation/config/web.txt rename to Documentation/config/web.adoc diff --git a/Documentation/config/worktree.txt b/Documentation/config/worktree.adoc similarity index 100% rename from Documentation/config/worktree.txt rename to Documentation/config/worktree.adoc diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.adoc similarity index 100% rename from Documentation/date-formats.txt rename to Documentation/date-formats.adoc diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.adoc similarity index 99% rename from Documentation/diff-format.txt rename to Documentation/diff-format.adoc index c72fb379867..80e36e153da 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.adoc @@ -121,7 +121,7 @@ Note that 'combined diff' lists only files which were modified from all parents. -include::diff-generate-patch.txt[] +include::diff-generate-patch.adoc[] other diff formats diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.adoc similarity index 100% rename from Documentation/diff-generate-patch.txt rename to Documentation/diff-generate-patch.adoc diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.adoc similarity index 100% rename from Documentation/diff-options.txt rename to Documentation/diff-options.adoc diff --git a/Documentation/everyday.txto b/Documentation/everyday.adoco similarity index 100% rename from Documentation/everyday.txto rename to Documentation/everyday.adoco diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.adoc similarity index 100% rename from Documentation/fetch-options.txt rename to Documentation/fetch-options.adoc diff --git a/Documentation/fsck-msgids.txt b/Documentation/fsck-msgids.adoc similarity index 100% rename from Documentation/fsck-msgids.txt rename to Documentation/fsck-msgids.adoc diff --git a/Documentation/git-add.txt b/Documentation/git-add.adoc similarity index 99% rename from Documentation/git-add.txt rename to Documentation/git-add.adoc index 5f2c3592b8d..eba0b419ce5 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.adoc @@ -437,10 +437,10 @@ they will make the patch impossible to apply: CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] :git-add: 1 -include::config/add.txt[] +include::config/add.adoc[] SEE ALSO -------- diff --git a/Documentation/git-am.txt b/Documentation/git-am.adoc similarity index 98% rename from Documentation/git-am.txt rename to Documentation/git-am.adoc index 69d5cc9f210..221070de481 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.adoc @@ -120,7 +120,7 @@ default. You can use `--no-utf8` to override this. am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]. -include::rerere-options.txt[] +include::rerere-options.adoc[] --ignore-space-change:: --ignore-whitespace:: @@ -284,9 +284,9 @@ information. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/am.txt[] +include::config/am.adoc[] SEE ALSO -------- diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.adoc similarity index 96% rename from Documentation/git-annotate.txt rename to Documentation/git-annotate.adoc index 5ae8aabe0f8..965bc676afe 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/git-annotate.adoc @@ -22,7 +22,7 @@ familiar command name for people coming from other SCM systems. OPTIONS ------- -include::blame-options.txt[] +include::blame-options.adoc[] SEE ALSO -------- diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.adoc similarity index 99% rename from Documentation/git-apply.txt rename to Documentation/git-apply.adoc index dd4a61ef289..952518b8af6 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.adoc @@ -270,9 +270,9 @@ has no effect when `--index` or `--cached` is in use. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/apply.txt[] +include::config/apply.adoc[] SUBMODULES ---------- diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.adoc similarity index 100% rename from Documentation/git-archimport.txt rename to Documentation/git-archimport.adoc diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.adoc similarity index 100% rename from Documentation/git-archive.txt rename to Documentation/git-archive.adoc diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.adoc similarity index 100% rename from Documentation/git-bisect-lk2009.txt rename to Documentation/git-bisect-lk2009.adoc diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.adoc similarity index 100% rename from Documentation/git-bisect.txt rename to Documentation/git-bisect.adoc diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.adoc similarity index 98% rename from Documentation/git-blame.txt rename to Documentation/git-blame.adoc index b1d7fb539d0..f75ed447902 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.adoc @@ -48,7 +48,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output OPTIONS ------- -include::blame-options.txt[] +include::blame-options.adoc[] -c:: Use the same output mode as linkgit:git-annotate[1] (Default: off). @@ -244,9 +244,9 @@ See linkgit:gitmailmap[5]. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/blame.txt[] +include::config/blame.adoc[] SEE ALSO -------- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.adoc similarity index 99% rename from Documentation/git-branch.txt rename to Documentation/git-branch.adoc index 0b084429323..7a073a36d6d 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.adoc @@ -345,9 +345,9 @@ CONFIGURATION `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/branch.txt[] +include::config/branch.adoc[] EXAMPLES -------- @@ -415,7 +415,7 @@ serve four related but different purposes: - `--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD. -include::ref-reachability-filters.txt[] +include::ref-reachability-filters.adoc[] SEE ALSO -------- diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.adoc similarity index 100% rename from Documentation/git-bugreport.txt rename to Documentation/git-bugreport.adoc diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.adoc similarity index 100% rename from Documentation/git-bundle.txt rename to Documentation/git-bundle.adoc diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.adoc similarity index 100% rename from Documentation/git-cat-file.txt rename to Documentation/git-cat-file.adoc diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.adoc similarity index 100% rename from Documentation/git-check-attr.txt rename to Documentation/git-check-attr.adoc diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.adoc similarity index 100% rename from Documentation/git-check-ignore.txt rename to Documentation/git-check-ignore.adoc diff --git a/Documentation/git-check-mailmap.txt b/Documentation/git-check-mailmap.adoc similarity index 100% rename from Documentation/git-check-mailmap.txt rename to Documentation/git-check-mailmap.adoc diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.adoc similarity index 100% rename from Documentation/git-check-ref-format.txt rename to Documentation/git-check-ref-format.adoc diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.adoc similarity index 100% rename from Documentation/git-checkout-index.txt rename to Documentation/git-checkout-index.adoc diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.adoc similarity index 99% rename from Documentation/git-checkout.txt rename to Documentation/git-checkout.adoc index bf26655764f..a66c53a5cd1 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.adoc @@ -612,9 +612,9 @@ $ git add frotz CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/checkout.txt[] +include::config/checkout.adoc[] SEE ALSO -------- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.adoc similarity index 99% rename from Documentation/git-cherry-pick.txt rename to Documentation/git-cherry-pick.adoc index 81ace900fc5..42b41923d5f 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.adoc @@ -172,11 +172,11 @@ fail unless one of `--empty=keep` or `--allow-empty` are specified. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. -include::rerere-options.txt[] +include::rerere-options.adoc[] SEQUENCER SUBCOMMANDS --------------------- -include::sequencer.txt[] +include::sequencer.adoc[] EXAMPLES -------- diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.adoc similarity index 100% rename from Documentation/git-cherry.txt rename to Documentation/git-cherry.adoc diff --git a/Documentation/git-citool.txt b/Documentation/git-citool.adoc similarity index 100% rename from Documentation/git-citool.txt rename to Documentation/git-citool.adoc diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.adoc similarity index 98% rename from Documentation/git-clean.txt rename to Documentation/git-clean.adoc index fd171654163..bed52c203b4 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.adoc @@ -140,9 +140,9 @@ help:: CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/clean.txt[] +include::config/clean.adoc[] SEE ALSO -------- diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.adoc similarity index 98% rename from Documentation/git-clone.txt rename to Documentation/git-clone.adoc index de8d8f58930..db1c06560aa 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.adoc @@ -321,7 +321,7 @@ or `--mirror` is given) Specify the given ref storage format for the repository. The valid values are: + -include::ref-storage-format.txt[] +include::ref-storage-format.adoc[] `-j` __:: `--jobs` __:: @@ -348,7 +348,7 @@ __:: `--shallow-since`, and `--shallow-exclude`. :git-clone: 1 -include::urls.txt[] +include::urls.adoc[] EXAMPLES -------- @@ -396,11 +396,11 @@ $ git clone --no-local /home/otheruser/proj.git /pub/scm/proj.git CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/init.txt[] +include::config/init.adoc[] -include::config/clone.txt[] +include::config/clone.adoc[] GIT diff --git a/Documentation/git-column.txt b/Documentation/git-column.adoc similarity index 96% rename from Documentation/git-column.txt rename to Documentation/git-column.adoc index 18431647a2d..85fb87c94a4 100644 --- a/Documentation/git-column.txt +++ b/Documentation/git-column.adoc @@ -77,9 +77,9 @@ v2.4.8 v2.4.9 CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/column.txt[] +include::config/column.adoc[] GIT --- diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.adoc similarity index 98% rename from Documentation/git-commit-graph.txt rename to Documentation/git-commit-graph.adoc index 903b16830ea..50b50168045 100644 --- a/Documentation/git-commit-graph.txt +++ b/Documentation/git-commit-graph.adoc @@ -148,9 +148,9 @@ $ git rev-parse HEAD | git commit-graph write --stdin-commits --append CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/commitgraph.txt[] +include::config/commitgraph.adoc[] FILE FORMAT diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.adoc similarity index 98% rename from Documentation/git-commit-tree.txt rename to Documentation/git-commit-tree.adoc index 2e2c5810983..6472921e14b 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.adoc @@ -80,12 +80,12 @@ A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D. -include::date-formats.txt[] +include::date-formats.adoc[] Discussion ---------- -include::i18n.txt[] +include::i18n.adoc[] FILES ----- diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.adoc similarity index 99% rename from Documentation/git-commit.txt rename to Documentation/git-commit.adoc index c822113c111..33ac5c41851 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.adoc @@ -198,7 +198,7 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`. message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options. -include::signoff-option.txt[] +include::signoff-option.adoc[] --trailer [(=|:)]:: Specify a (, ) pair that should be applied as a @@ -537,7 +537,7 @@ The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases. :git-commit: 1 -include::date-formats.txt[] +include::date-formats.adoc[] DISCUSSION ---------- @@ -550,7 +550,7 @@ as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body. -include::i18n.txt[] +include::i18n.adoc[] ENVIRONMENT AND CONFIGURATION VARIABLES --------------------------------------- @@ -559,9 +559,9 @@ The editor used to edit the commit log message will be chosen from the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/commit.txt[] +include::config/commit.adoc[] HOOKS ----- diff --git a/Documentation/git-config.txt b/Documentation/git-config.adoc similarity index 99% rename from Documentation/git-config.txt rename to Documentation/git-config.adoc index 3e420177c15..888f8ba54b8 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.adoc @@ -610,7 +610,7 @@ http.cookieFile /tmp/cookie.txt http.sslverify false ------------ -include::config.txt[] +include::config.adoc[] BUGS ---- diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.adoc similarity index 100% rename from Documentation/git-count-objects.txt rename to Documentation/git-count-objects.adoc diff --git a/Documentation/git-credential-cache--daemon.txt b/Documentation/git-credential-cache--daemon.adoc similarity index 100% rename from Documentation/git-credential-cache--daemon.txt rename to Documentation/git-credential-cache--daemon.adoc diff --git a/Documentation/git-credential-cache.txt b/Documentation/git-credential-cache.adoc similarity index 100% rename from Documentation/git-credential-cache.txt rename to Documentation/git-credential-cache.adoc diff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.adoc similarity index 100% rename from Documentation/git-credential-store.txt rename to Documentation/git-credential-store.adoc diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.adoc similarity index 100% rename from Documentation/git-credential.txt rename to Documentation/git-credential.adoc diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.adoc similarity index 100% rename from Documentation/git-cvsexportcommit.txt rename to Documentation/git-cvsexportcommit.adoc diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.adoc similarity index 100% rename from Documentation/git-cvsimport.txt rename to Documentation/git-cvsimport.adoc diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.adoc similarity index 100% rename from Documentation/git-cvsserver.txt rename to Documentation/git-cvsserver.adoc diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.adoc similarity index 100% rename from Documentation/git-daemon.txt rename to Documentation/git-daemon.adoc diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.adoc similarity index 100% rename from Documentation/git-describe.txt rename to Documentation/git-describe.adoc diff --git a/Documentation/git-diagnose.txt b/Documentation/git-diagnose.adoc similarity index 100% rename from Documentation/git-diagnose.txt rename to Documentation/git-diagnose.adoc diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.adoc similarity index 95% rename from Documentation/git-diff-files.txt rename to Documentation/git-diff-files.adoc index bf78e314313..2b2358ca1ca 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.adoc @@ -20,7 +20,7 @@ same as for 'git diff-index' and 'git diff-tree'. OPTIONS ------- -include::diff-options.txt[] +include::diff-options.adoc[] -1 --base:: -2 --ours:: @@ -45,7 +45,7 @@ omit diff output for unmerged entries and just show "Unmerged". Remain silent even for nonexistent files -include::diff-format.txt[] +include::diff-format.adoc[] GIT --- diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.adoc similarity index 98% rename from Documentation/git-diff-index.txt rename to Documentation/git-diff-index.adoc index 4de1d4c8f11..911446a2964 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.adoc @@ -21,7 +21,7 @@ files are compared. OPTIONS ------- -include::diff-options.txt[] +include::diff-options.adoc[] :: The id of a tree object to diff against. @@ -40,7 +40,7 @@ include::diff-options.txt[] 'git diff-index' say that all non-checked-out files are up to date. -include::diff-format.txt[] +include::diff-format.adoc[] OPERATING MODES --------------- diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.adoc similarity index 97% rename from Documentation/git-diff-tree.txt rename to Documentation/git-diff-tree.adoc index 09286a85eb2..f1e3134bdef 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.adoc @@ -24,7 +24,7 @@ Note that 'git diff-tree' can use the tree encapsulated in a commit object. OPTIONS ------- -include::diff-options.txt[] +include::diff-options.adoc[] :: The id of a tree object. @@ -84,7 +84,7 @@ commits (but not trees). This flag causes 'git diff-tree --stdin' to also show the commit message before the differences. -include::pretty-options.txt[] +include::pretty-options.adoc[] --no-commit-id:: 'git diff-tree' outputs a line with the commit ID when @@ -122,9 +122,9 @@ include::pretty-options.txt[] if the diff itself is empty. -include::pretty-formats.txt[] +include::pretty-formats.adoc[] -include::diff-format.txt[] +include::diff-format.adoc[] GIT --- diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.adoc similarity index 98% rename from Documentation/git-diff.txt rename to Documentation/git-diff.adoc index e19f31e8b9d..dec173a3451 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.adoc @@ -123,7 +123,7 @@ do not mean a range as defined in the OPTIONS ------- :git-diff: 1 -include::diff-options.txt[] +include::diff-options.adoc[] `-1`:: `--base`:: @@ -154,7 +154,7 @@ section "3-Way Merge" for detailed information. names and get diff for all files under them). -include::diff-format.txt[] +include::diff-format.adoc[] EXAMPLES -------- @@ -232,10 +232,10 @@ $ git diff -R <2> CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] :git-diff: 1 -include::config/diff.txt[] +include::config/diff.adoc[] SEE ALSO -------- diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.adoc similarity index 98% rename from Documentation/git-difftool.txt rename to Documentation/git-difftool.adoc index a616f8b2e6f..d596205eaf3 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.adoc @@ -119,9 +119,9 @@ CONFIGURATION 'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/difftool.txt[] +include::config/difftool.adoc[] SEE ALSO -------- diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.adoc similarity index 100% rename from Documentation/git-fast-export.txt rename to Documentation/git-fast-export.adoc diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.adoc similarity index 99% rename from Documentation/git-fast-import.txt rename to Documentation/git-fast-import.adoc index 3d435157a66..58a2eaa51a8 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.adoc @@ -1578,9 +1578,9 @@ compression. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/fastimport.txt[] +include::config/fastimport.adoc[] SEE ALSO -------- diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.adoc similarity index 100% rename from Documentation/git-fetch-pack.txt rename to Documentation/git-fetch-pack.adoc diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.adoc similarity index 98% rename from Documentation/git-fetch.txt rename to Documentation/git-fetch.adoc index 50900a50dab..16f5d9d69af 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.adoc @@ -44,15 +44,15 @@ may be used by scripts or other git commands, such as linkgit:git-pull[1]. OPTIONS ------- -include::fetch-options.txt[] +include::fetch-options.adoc[] -include::pull-fetch-param.txt[] +include::pull-fetch-param.adoc[] --stdin:: Read refspecs, one per line, from stdin in addition to those provided as arguments. The "tag " format is not supported. -include::urls-remotes.txt[] +include::urls-remotes.adoc[] CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]] @@ -292,14 +292,14 @@ The first command fetches the `maint` branch from the repository at objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1]). -include::transfer-data-leaks.txt[] +include::transfer-data-leaks.adoc[] CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/fetch.txt[] +include::config/fetch.adoc[] BUGS ---- diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.adoc similarity index 100% rename from Documentation/git-filter-branch.txt rename to Documentation/git-filter-branch.adoc diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.adoc similarity index 98% rename from Documentation/git-fmt-merge-msg.txt rename to Documentation/git-fmt-merge-msg.adoc index 6f28812f38d..0f3328956df 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.adoc @@ -55,7 +55,7 @@ OPTIONS CONFIGURATION ------------- -include::config/fmt-merge-msg.txt[] +include::config/fmt-merge-msg.adoc[] merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.adoc similarity index 99% rename from Documentation/git-for-each-ref.txt rename to Documentation/git-for-each-ref.adoc index d3764401a23..ffb97e62c2d 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.adoc @@ -538,7 +538,7 @@ will be reported. NOTES ----- -include::ref-reachability-filters.txt[] +include::ref-reachability-filters.adoc[] SEE ALSO -------- diff --git a/Documentation/git-for-each-repo.txt b/Documentation/git-for-each-repo.adoc similarity index 100% rename from Documentation/git-for-each-repo.txt rename to Documentation/git-for-each-repo.adoc diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.adoc similarity index 99% rename from Documentation/git-format-patch.txt rename to Documentation/git-format-patch.adoc index 5dc7bb4cfc3..a8b53db9a66 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.adoc @@ -105,7 +105,7 @@ reference. OPTIONS ------- :git-format-patch: 1 -include::diff-options.txt[] +include::diff-options.adoc[] -:: Prepare patches from the topmost commits. diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.adoc similarity index 100% rename from Documentation/git-fsck-objects.txt rename to Documentation/git-fsck-objects.adoc diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.adoc similarity index 98% rename from Documentation/git-fsck.txt rename to Documentation/git-fsck.adoc index 5b82e4605c2..8f32800a835 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.adoc @@ -107,9 +107,9 @@ care about this output and want to speed it up further. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/fsck.txt[] +include::config/fsck.adoc[] DISCUSSION ---------- @@ -161,7 +161,7 @@ each error means, with their default severity. The severity of the error, other than those that are marked as "(FATAL)", can be tweaked by setting the corresponding `fsck.` configuration variable. -include::fsck-msgids.txt[] +include::fsck-msgids.adoc[] Environment Variables diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.adoc similarity index 97% rename from Documentation/git-fsmonitor--daemon.txt rename to Documentation/git-fsmonitor--daemon.adoc index 8585d19f4d8..8fe5241b08b 100644 --- a/Documentation/git-fsmonitor--daemon.txt +++ b/Documentation/git-fsmonitor--daemon.adoc @@ -97,9 +97,9 @@ error that will cause the daemon and the currently running command to exit. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/fsmonitor--daemon.txt[] +include::config/fsmonitor--daemon.adoc[] GIT --- diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.adoc similarity index 98% rename from Documentation/git-gc.txt rename to Documentation/git-gc.adoc index 370e22faaeb..b61bacd25c9 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.adoc @@ -122,9 +122,9 @@ users and their repositories. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/gc.txt[] +include::config/gc.adoc[] NOTES ----- diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.adoc similarity index 100% rename from Documentation/git-get-tar-commit-id.txt rename to Documentation/git-get-tar-commit-id.adoc diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.adoc similarity index 99% rename from Documentation/git-grep.txt rename to Documentation/git-grep.adoc index 1e6d7b65c84..a548585d4cb 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.adoc @@ -351,9 +351,9 @@ experienced in this case, it might be desirable to use `--threads=1`. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/grep.txt[] +include::config/grep.adoc[] GIT --- diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.adoc similarity index 100% rename from Documentation/git-gui.txt rename to Documentation/git-gui.adoc diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.adoc similarity index 100% rename from Documentation/git-hash-object.txt rename to Documentation/git-hash-object.adoc diff --git a/Documentation/git-help.txt b/Documentation/git-help.adoc similarity index 100% rename from Documentation/git-help.txt rename to Documentation/git-help.adoc diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.adoc similarity index 100% rename from Documentation/git-hook.txt rename to Documentation/git-hook.adoc diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.adoc similarity index 100% rename from Documentation/git-http-backend.txt rename to Documentation/git-http-backend.adoc diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.adoc similarity index 100% rename from Documentation/git-http-fetch.txt rename to Documentation/git-http-fetch.adoc diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.adoc similarity index 100% rename from Documentation/git-http-push.txt rename to Documentation/git-http-push.adoc diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.adoc similarity index 97% rename from Documentation/git-imap-send.txt rename to Documentation/git-imap-send.adoc index c8a89d7243b..26ccf4e433b 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.adoc @@ -54,9 +54,9 @@ CONFIGURATION To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/imap.txt[] +include::config/imap.adoc[] EXAMPLES -------- diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.adoc similarity index 99% rename from Documentation/git-index-pack.txt rename to Documentation/git-index-pack.adoc index 58dd5b5f0e8..270056cf635 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.adoc @@ -130,7 +130,7 @@ information on the possible values of `` and ``. + This option cannot be used with --stdin. + -include::object-format-disclaimer.txt[] +include::object-format-disclaimer.adoc[] --promisor[=]:: Before committing the pack-index, create a .promisor file for this diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.adoc similarity index 100% rename from Documentation/git-init-db.txt rename to Documentation/git-init-db.adoc diff --git a/Documentation/git-init.txt b/Documentation/git-init.adoc similarity index 97% rename from Documentation/git-init.txt rename to Documentation/git-init.adoc index 315f7f7530c..a0dffba665f 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.adoc @@ -55,12 +55,12 @@ current working directory. Specify the given object __ (hash algorithm) for the repository. The valid values are `sha1` and (if enabled) `sha256`. `sha1` is the default. + -include::object-format-disclaimer.txt[] +include::object-format-disclaimer.adoc[] `--ref-format=`:: Specify the given ref storage __ for the repository. The valid values are: + -include::ref-storage-format.txt[] +include::ref-storage-format.adoc[] `--template=`:: Specify the directory from which templates will be used. (See the "TEMPLATE @@ -178,11 +178,11 @@ $ git commit <3> CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] :git-init: -include::config/init.txt[] +include::config/init.adoc[] GIT --- diff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.adoc similarity index 100% rename from Documentation/git-instaweb.txt rename to Documentation/git-instaweb.adoc diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.adoc similarity index 100% rename from Documentation/git-interpret-trailers.txt rename to Documentation/git-interpret-trailers.adoc diff --git a/Documentation/git-log.txt b/Documentation/git-log.adoc similarity index 95% rename from Documentation/git-log.txt rename to Documentation/git-log.adoc index 579682172fe..ae8a7e2d638 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.adoc @@ -16,7 +16,7 @@ DESCRIPTION Shows the commit logs. :git-log: 1 -include::rev-list-description.txt[] +include::rev-list-description.adoc[] The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to @@ -89,7 +89,7 @@ produced by `--stat`, etc. Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance. -include::line-range-options.txt[] +include::line-range-options.adoc[] :: Show only commits in the specified revision range. When no @@ -109,9 +109,9 @@ include::line-range-options.txt[] Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises. -include::rev-list-options.txt[] +include::rev-list-options.adoc[] -include::pretty-formats.txt[] +include::pretty-formats.adoc[] DIFF FORMATTING --------------- @@ -128,9 +128,9 @@ the default format for merge commits. :git-log: 1 :diff-merges-default: `off` -include::diff-options.txt[] +include::diff-options.adoc[] -include::diff-generate-patch.txt[] +include::diff-generate-patch.adoc[] EXAMPLES -------- @@ -192,7 +192,7 @@ EXAMPLES DISCUSSION ---------- -include::i18n.txt[] +include::i18n.adoc[] CONFIGURATION ------------- @@ -209,11 +209,11 @@ i18n.logOutputEncoding:: Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/log.txt[] +include::config/log.adoc[] -include::config/notes.txt[] +include::config/notes.adoc[] GIT --- diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.adoc similarity index 100% rename from Documentation/git-ls-files.txt rename to Documentation/git-ls-files.adoc diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.adoc similarity index 100% rename from Documentation/git-ls-remote.txt rename to Documentation/git-ls-remote.adoc diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.adoc similarity index 100% rename from Documentation/git-ls-tree.txt rename to Documentation/git-ls-tree.adoc diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.adoc similarity index 97% rename from Documentation/git-mailinfo.txt rename to Documentation/git-mailinfo.adoc index 28060283c70..3b24c9abd98 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.adoc @@ -118,9 +118,9 @@ If no such configuration option has been set, `warn` will be used. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/mailinfo.txt[] +include::config/mailinfo.adoc[] GIT --- diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.adoc similarity index 100% rename from Documentation/git-mailsplit.txt rename to Documentation/git-mailsplit.adoc diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.adoc similarity index 99% rename from Documentation/git-maintenance.txt rename to Documentation/git-maintenance.adoc index 6e6651309d3..0450d74aff1 100644 --- a/Documentation/git-maintenance.txt +++ b/Documentation/git-maintenance.adoc @@ -409,9 +409,9 @@ custom tasks. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/maintenance.txt[] +include::config/maintenance.adoc[] GIT diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.adoc similarity index 100% rename from Documentation/git-merge-base.txt rename to Documentation/git-merge-base.adoc diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.adoc similarity index 100% rename from Documentation/git-merge-file.txt rename to Documentation/git-merge-file.adoc diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.adoc similarity index 100% rename from Documentation/git-merge-index.txt rename to Documentation/git-merge-index.adoc diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.adoc similarity index 100% rename from Documentation/git-merge-one-file.txt rename to Documentation/git-merge-one-file.adoc diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.adoc similarity index 100% rename from Documentation/git-merge-tree.txt rename to Documentation/git-merge-tree.adoc diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.adoc similarity index 98% rename from Documentation/git-merge.txt rename to Documentation/git-merge.adoc index 1ab69f61f57..64281d6d44d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.adoc @@ -65,7 +65,7 @@ OPTIONS ------- :git-merge: 1 -include::merge-options.txt[] +include::merge-options.adoc[] -m :: Set the commit message to be used for the merge commit (in @@ -91,7 +91,7 @@ invocations. The automated message can include the branch description. If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message. -include::rerere-options.txt[] +include::rerere-options.adoc[] --overwrite-ignore:: --no-overwrite-ignore:: @@ -385,7 +385,7 @@ changes into a merge commit. Small fixups like bumping release/version name would be acceptable. -include::merge-strategies.txt[] +include::merge-strategies.adoc[] CONFIGURATION ------------- @@ -395,9 +395,9 @@ branch..mergeOptions:: supported options are the same as those of `git merge`, but option values containing whitespace characters are currently not supported. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/merge.txt[] +include::config/merge.adoc[] SEE ALSO -------- diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.adoc similarity index 100% rename from Documentation/git-mergetool--lib.txt rename to Documentation/git-mergetool--lib.adoc diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.adoc similarity index 97% rename from Documentation/git-mergetool.txt rename to Documentation/git-mergetool.adoc index b9e20c5dcd8..046c3258f05 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.adoc @@ -104,9 +104,9 @@ CONFIGURATION ------------- :git-mergetool: 1 -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/mergetool.txt[] +include::config/mergetool.adoc[] TEMPORARY FILES --------------- @@ -123,7 +123,7 @@ BACKEND SPECIFIC HINTS vimdiff ~~~~~~~ -include::mergetools/vimdiff.txt[] +include::mergetools/vimdiff.adoc[] GIT --- diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.adoc similarity index 100% rename from Documentation/git-mktag.txt rename to Documentation/git-mktag.adoc diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.adoc similarity index 100% rename from Documentation/git-mktree.txt rename to Documentation/git-mktree.adoc diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.adoc similarity index 100% rename from Documentation/git-multi-pack-index.txt rename to Documentation/git-multi-pack-index.adoc diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.adoc similarity index 100% rename from Documentation/git-mv.txt rename to Documentation/git-mv.adoc diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.adoc similarity index 100% rename from Documentation/git-name-rev.txt rename to Documentation/git-name-rev.adoc diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.adoc similarity index 99% rename from Documentation/git-notes.txt rename to Documentation/git-notes.adoc index 84022f99d76..02b743392f9 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.adoc @@ -345,9 +345,9 @@ core.notesRef:: This setting can be overridden through the environment and command line. -include::includes/cmd-config-section-rest.txt[] +include::includes/cmd-config-section-rest.adoc[] -include::config/notes.txt[] +include::config/notes.adoc[] ENVIRONMENT diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.adoc similarity index 100% rename from Documentation/git-p4.txt rename to Documentation/git-p4.adoc diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.adoc similarity index 100% rename from Documentation/git-pack-objects.txt rename to Documentation/git-pack-objects.adoc diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.adoc similarity index 100% rename from Documentation/git-pack-redundant.txt rename to Documentation/git-pack-redundant.adoc diff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.adoc similarity index 100% rename from Documentation/git-pack-refs.txt rename to Documentation/git-pack-refs.adoc diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.adoc similarity index 100% rename from Documentation/git-patch-id.txt rename to Documentation/git-patch-id.adoc diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.adoc similarity index 100% rename from Documentation/git-prune-packed.txt rename to Documentation/git-prune-packed.adoc diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.adoc similarity index 100% rename from Documentation/git-prune.txt rename to Documentation/git-prune.adoc diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.adoc similarity index 97% rename from Documentation/git-pull.txt rename to Documentation/git-pull.adoc index b2ae496e488..3f4ecc47301 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.adoc @@ -102,7 +102,7 @@ Options related to merging :git-pull: 1 -include::merge-options.txt[] +include::merge-options.adoc[] -r:: --rebase[=(false|true|merges|interactive)]:: @@ -136,13 +136,13 @@ unless you have read linkgit:git-rebase[1] carefully. Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -include::fetch-options.txt[] +include::fetch-options.adoc[] -include::pull-fetch-param.txt[] +include::pull-fetch-param.adoc[] -include::urls-remotes.txt[] +include::urls-remotes.adoc[] -include::merge-strategies.txt[] +include::merge-strategies.adoc[] DEFAULT BEHAVIOUR ----------------- @@ -234,7 +234,7 @@ If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'. -include::transfer-data-leaks.txt[] +include::transfer-data-leaks.adoc[] BUGS ---- diff --git a/Documentation/git-push.txt b/Documentation/git-push.adoc similarity index 99% rename from Documentation/git-push.txt rename to Documentation/git-push.adoc index 9b7cfbc5c1d..d1978650d60 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.adoc @@ -432,7 +432,7 @@ further recursion will occur. In this case, "only" is treated as "on-demand". --ipv6:: Use IPv6 addresses only, ignoring IPv4 addresses. -include::urls-remotes.txt[] +include::urls-remotes.adoc[] OUTPUT ------ @@ -695,14 +695,14 @@ Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable. As such, these commits would be removed by a `git gc` command on the origin repository. -include::transfer-data-leaks.txt[] +include::transfer-data-leaks.adoc[] CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/push.txt[] +include::config/push.adoc[] GIT --- diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.adoc similarity index 100% rename from Documentation/git-quiltimport.txt rename to Documentation/git-quiltimport.adoc diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.adoc similarity index 100% rename from Documentation/git-range-diff.txt rename to Documentation/git-range-diff.adoc diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.adoc similarity index 100% rename from Documentation/git-read-tree.txt rename to Documentation/git-read-tree.adoc diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.adoc similarity index 99% rename from Documentation/git-rebase.txt rename to Documentation/git-rebase.adoc index b18cdbc0239..133fe8c5e6a 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.adoc @@ -401,7 +401,7 @@ See also INCOMPATIBLE OPTIONS below. + See also INCOMPATIBLE OPTIONS below. -include::rerere-options.txt[] +include::rerere-options.adoc[] -S[]:: --gpg-sign[=]:: @@ -825,7 +825,7 @@ completeness: * State directories: The two backends keep their state in different directories under `.git/` -include::merge-strategies.txt[] +include::merge-strategies.adoc[] NOTES ----- @@ -1294,10 +1294,10 @@ merge cmake CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/rebase.txt[] -include::config/sequencer.txt[] +include::config/rebase.adoc[] +include::config/sequencer.adoc[] GIT --- diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.adoc similarity index 100% rename from Documentation/git-receive-pack.txt rename to Documentation/git-receive-pack.adoc diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.adoc similarity index 100% rename from Documentation/git-reflog.txt rename to Documentation/git-reflog.adoc diff --git a/Documentation/git-refs.txt b/Documentation/git-refs.adoc similarity index 98% rename from Documentation/git-refs.txt rename to Documentation/git-refs.adoc index 9829984b0a4..95f25776aa3 100644 --- a/Documentation/git-refs.txt +++ b/Documentation/git-refs.adoc @@ -34,7 +34,7 @@ The following options are specific to 'git refs migrate': --ref-format=:: The ref format to migrate the ref store to. Can be one of: + -include::ref-storage-format.txt[] +include::ref-storage-format.adoc[] --dry-run:: Perform the migration, but do not modify the repository. The migrated diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.adoc similarity index 100% rename from Documentation/git-remote-ext.txt rename to Documentation/git-remote-ext.adoc diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.adoc similarity index 100% rename from Documentation/git-remote-fd.txt rename to Documentation/git-remote-fd.adoc diff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.adoco similarity index 100% rename from Documentation/git-remote-helpers.txto rename to Documentation/git-remote-helpers.adoco diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.adoc similarity index 100% rename from Documentation/git-remote.txt rename to Documentation/git-remote.adoc diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.adoc similarity index 100% rename from Documentation/git-repack.txt rename to Documentation/git-repack.adoc diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.adoc similarity index 100% rename from Documentation/git-replace.txt rename to Documentation/git-replace.adoc diff --git a/Documentation/git-replay.txt b/Documentation/git-replay.adoc similarity index 99% rename from Documentation/git-replay.txt rename to Documentation/git-replay.adoc index 8f3300c683a..0b12bf8aa4d 100644 --- a/Documentation/git-replay.txt +++ b/Documentation/git-replay.adoc @@ -49,7 +49,7 @@ the new commits (in other words, this mimics a cherry-pick operation). to. See "Specifying Ranges" in linkgit:git-rev-parse[1] and the "Commit Limiting" options below. -include::rev-list-options.txt[] +include::rev-list-options.adoc[] OUTPUT ------ diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.adoc similarity index 100% rename from Documentation/git-request-pull.txt rename to Documentation/git-request-pull.adoc diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.adoc similarity index 100% rename from Documentation/git-rerere.txt rename to Documentation/git-rerere.adoc diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.adoc similarity index 100% rename from Documentation/git-reset.txt rename to Documentation/git-reset.adoc diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.adoc similarity index 100% rename from Documentation/git-restore.txt rename to Documentation/git-restore.adoc diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.adoc similarity index 96% rename from Documentation/git-rev-list.txt rename to Documentation/git-rev-list.adoc index 2e05c4b5109..f582491dd43 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.adoc @@ -15,7 +15,7 @@ DESCRIPTION ----------- :git-rev-list: 1 -include::rev-list-description.txt[] +include::rev-list-description.adoc[] 'rev-list' is an essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For @@ -27,9 +27,9 @@ OPTIONS ------- :git-rev-list: 1 -include::rev-list-options.txt[] +include::rev-list-options.adoc[] -include::pretty-formats.txt[] +include::pretty-formats.adoc[] EXAMPLES -------- diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.adoc similarity index 99% rename from Documentation/git-rev-parse.txt rename to Documentation/git-rev-parse.adoc index dc12d385346..cc32b4b4f0f 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.adoc @@ -351,7 +351,7 @@ Other Options Flags and parameters to be parsed. -include::revisions.txt[] +include::revisions.adoc[] PARSEOPT -------- diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.adoc similarity index 97% rename from Documentation/git-revert.txt rename to Documentation/git-revert.adoc index 568925db533..ffba365e639 100644 --- a/Documentation/git-revert.txt +++ b/Documentation/git-revert.adoc @@ -112,7 +112,7 @@ effect to your index in a row. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. -include::rerere-options.txt[] +include::rerere-options.adoc[] --reference:: Instead of starting the body of the log message with "This @@ -125,7 +125,7 @@ include::rerere-options.txt[] SEQUENCER SUBCOMMANDS --------------------- -include::sequencer.txt[] +include::sequencer.adoc[] EXAMPLES -------- @@ -155,9 +155,9 @@ Please consider rewording these to be shorter and more unique. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/revert.txt[] +include::config/revert.adoc[] SEE ALSO -------- diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.adoc similarity index 100% rename from Documentation/git-rm.txt rename to Documentation/git-rm.adoc diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.adoc similarity index 99% rename from Documentation/git-send-email.txt rename to Documentation/git-send-email.adoc index bc3ef45acbd..7f223db42dd 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.adoc @@ -492,9 +492,9 @@ Information CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/sendemail.txt[] +include::config/sendemail.adoc[] EXAMPLES -------- diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.adoc similarity index 100% rename from Documentation/git-send-pack.txt rename to Documentation/git-send-pack.adoc diff --git a/Documentation/git-sh-i18n--envsubst.txt b/Documentation/git-sh-i18n--envsubst.adoc similarity index 100% rename from Documentation/git-sh-i18n--envsubst.txt rename to Documentation/git-sh-i18n--envsubst.adoc diff --git a/Documentation/git-sh-i18n.txt b/Documentation/git-sh-i18n.adoc similarity index 100% rename from Documentation/git-sh-i18n.txt rename to Documentation/git-sh-i18n.adoc diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.adoc similarity index 100% rename from Documentation/git-sh-setup.txt rename to Documentation/git-sh-setup.adoc diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.adoc similarity index 100% rename from Documentation/git-shell.txt rename to Documentation/git-shell.adoc diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.adoc similarity index 99% rename from Documentation/git-shortlog.txt rename to Documentation/git-shortlog.adoc index 7d0277d033d..d8ab38dcc1f 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.adoc @@ -114,7 +114,7 @@ Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises. :git-shortlog: 1 -include::rev-list-options.txt[] +include::rev-list-options.adoc[] MAPPING AUTHORS --------------- diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.adoc similarity index 98% rename from Documentation/git-show-branch.txt rename to Documentation/git-show-branch.adoc index bc31d8b6d33..7e86d54a24f 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.adoc @@ -202,9 +202,9 @@ topologically related to each other. CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/showbranch.txt[] +include::config/showbranch.adoc[] GIT --- diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.adoc similarity index 97% rename from Documentation/git-show-index.txt rename to Documentation/git-show-index.adoc index e49318a5a0a..f0e40e61643 100644 --- a/Documentation/git-show-index.txt +++ b/Documentation/git-show-index.adoc @@ -45,7 +45,7 @@ OPTIONS algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.. + -include::object-format-disclaimer.txt[] +include::object-format-disclaimer.adoc[] GIT --- diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.adoc similarity index 100% rename from Documentation/git-show-ref.txt rename to Documentation/git-show-ref.adoc diff --git a/Documentation/git-show.txt b/Documentation/git-show.adoc similarity index 92% rename from Documentation/git-show.txt rename to Documentation/git-show.adoc index 5eb67439aff..51044c814f5 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.adoc @@ -39,10 +39,10 @@ OPTIONS For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. -include::pretty-options.txt[] +include::pretty-options.adoc[] -include::pretty-formats.txt[] +include::pretty-formats.adoc[] DIFF FORMATTING @@ -52,9 +52,9 @@ diff output. :git-log: 1 :diff-merges-default: `dense-combined` -include::diff-options.txt[] +include::diff-options.adoc[] -include::diff-generate-patch.txt[] +include::diff-generate-patch.adoc[] EXAMPLES @@ -83,7 +83,7 @@ EXAMPLES DISCUSSION ---------- -include::i18n.txt[] +include::i18n.adoc[] GIT --- diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.adoc similarity index 100% rename from Documentation/git-sparse-checkout.txt rename to Documentation/git-sparse-checkout.adoc diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.adoc similarity index 100% rename from Documentation/git-stage.txt rename to Documentation/git-stage.adoc diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.adoc similarity index 99% rename from Documentation/git-stash.txt rename to Documentation/git-stash.adoc index 06fb7f1d18c..1a5177f4986 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.adoc @@ -388,9 +388,9 @@ xargs git log --merges --no-walk --grep=WIP CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/stash.txt[] +include::config/stash.adoc[] SEE ALSO diff --git a/Documentation/git-status.txt b/Documentation/git-status.adoc similarity index 100% rename from Documentation/git-status.txt rename to Documentation/git-status.adoc diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.adoc similarity index 100% rename from Documentation/git-stripspace.txt rename to Documentation/git-stripspace.adoc diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.adoc similarity index 100% rename from Documentation/git-submodule.txt rename to Documentation/git-submodule.adoc diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.adoc similarity index 100% rename from Documentation/git-svn.txt rename to Documentation/git-svn.adoc diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.adoc similarity index 99% rename from Documentation/git-switch.txt rename to Documentation/git-switch.adoc index f38e4c8afa1..f55315c51ea 100644 --- a/Documentation/git-switch.txt +++ b/Documentation/git-switch.adoc @@ -273,9 +273,9 @@ $ git switch -c good-surprises CONFIGURATION ------------- -include::includes/cmd-config-section-all.txt[] +include::includes/cmd-config-section-all.adoc[] -include::config/checkout.txt[] +include::config/checkout.adoc[] SEE ALSO -------- diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.adoc similarity index 100% rename from Documentation/git-symbolic-ref.txt rename to Documentation/git-symbolic-ref.adoc diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.adoc similarity index 99% rename from Documentation/git-tag.txt rename to Documentation/git-tag.adoc index 4494729f5e1..a4b1c0ec05a 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.adoc @@ -391,7 +391,7 @@ For example: $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 ------------ -include::date-formats.txt[] +include::date-formats.adoc[] FILES ----- @@ -406,7 +406,7 @@ FILES NOTES ----- -include::ref-reachability-filters.txt[] +include::ref-reachability-filters.adoc[] SEE ALSO -------- diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.adoc similarity index 100% rename from Documentation/git-tools.txt rename to Documentation/git-tools.adoc diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.adoc similarity index 100% rename from Documentation/git-unpack-file.txt rename to Documentation/git-unpack-file.adoc diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.adoc similarity index 100% rename from Documentation/git-unpack-objects.txt rename to Documentation/git-unpack-objects.adoc diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.adoc similarity index 100% rename from Documentation/git-update-index.txt rename to Documentation/git-update-index.adoc diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.adoc similarity index 100% rename from Documentation/git-update-ref.txt rename to Documentation/git-update-ref.adoc diff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.adoc similarity index 100% rename from Documentation/git-update-server-info.txt rename to Documentation/git-update-server-info.adoc diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.adoc similarity index 100% rename from Documentation/git-upload-archive.txt rename to Documentation/git-upload-archive.adoc diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.adoc similarity index 100% rename from Documentation/git-upload-pack.txt rename to Documentation/git-upload-pack.adoc diff --git a/Documentation/git-var.txt b/Documentation/git-var.adoc similarity index 100% rename from Documentation/git-var.txt rename to Documentation/git-var.adoc diff --git a/Documentation/git-verify-commit.txt b/Documentation/git-verify-commit.adoc similarity index 100% rename from Documentation/git-verify-commit.txt rename to Documentation/git-verify-commit.adoc diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.adoc similarity index 100% rename from Documentation/git-verify-pack.txt rename to Documentation/git-verify-pack.adoc diff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.adoc similarity index 100% rename from Documentation/git-verify-tag.txt rename to Documentation/git-verify-tag.adoc diff --git a/Documentation/git-version.txt b/Documentation/git-version.adoc similarity index 100% rename from Documentation/git-version.txt rename to Documentation/git-version.adoc diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.adoc similarity index 100% rename from Documentation/git-web--browse.txt rename to Documentation/git-web--browse.adoc diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.adoc similarity index 100% rename from Documentation/git-whatchanged.txt rename to Documentation/git-whatchanged.adoc diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.adoc similarity index 100% rename from Documentation/git-worktree.txt rename to Documentation/git-worktree.adoc diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.adoc similarity index 100% rename from Documentation/git-write-tree.txt rename to Documentation/git-write-tree.adoc diff --git a/Documentation/git.txt b/Documentation/git.adoc similarity index 98% rename from Documentation/git.txt rename to Documentation/git.adoc index e89a91dd0d0..a9c11833185 100644 --- a/Documentation/git.txt +++ b/Documentation/git.adoc @@ -245,17 +245,17 @@ ancillary user utilities. Main porcelain commands ~~~~~~~~~~~~~~~~~~~~~~~ -include::{build_dir}/cmds-mainporcelain.txt[] +include::{build_dir}/cmds-mainporcelain.adoc[] Ancillary Commands ~~~~~~~~~~~~~~~~~~ Manipulators: -include::{build_dir}/cmds-ancillarymanipulators.txt[] +include::{build_dir}/cmds-ancillarymanipulators.adoc[] Interrogators: -include::{build_dir}/cmds-ancillaryinterrogators.txt[] +include::{build_dir}/cmds-ancillaryinterrogators.adoc[] Interacting with Others @@ -264,7 +264,7 @@ Interacting with Others These commands are to interact with foreign SCM and with other people via patch over e-mail. -include::{build_dir}/cmds-foreignscminterface.txt[] +include::{build_dir}/cmds-foreignscminterface.adoc[] Reset, restore and revert ~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -313,13 +313,13 @@ repositories. Manipulation commands ~~~~~~~~~~~~~~~~~~~~~ -include::{build_dir}/cmds-plumbingmanipulators.txt[] +include::{build_dir}/cmds-plumbingmanipulators.adoc[] Interrogation commands ~~~~~~~~~~~~~~~~~~~~~~ -include::{build_dir}/cmds-plumbinginterrogators.txt[] +include::{build_dir}/cmds-plumbinginterrogators.adoc[] In general, the interrogate commands do not touch the files in the working tree. @@ -328,12 +328,12 @@ the working tree. Syncing repositories ~~~~~~~~~~~~~~~~~~~~ -include::{build_dir}/cmds-synchingrepositories.txt[] +include::{build_dir}/cmds-synchingrepositories.adoc[] The following are helper commands used by the above; end users typically do not use them directly. -include::{build_dir}/cmds-synchelpers.txt[] +include::{build_dir}/cmds-synchelpers.adoc[] Internal helper commands @@ -342,14 +342,14 @@ Internal helper commands These are internal helper commands used by other commands; end users typically do not use them directly. -include::{build_dir}/cmds-purehelpers.txt[] +include::{build_dir}/cmds-purehelpers.adoc[] Guides ------ The following documentation pages are guides about Git concepts. -include::{build_dir}/cmds-guide.txt[] +include::{build_dir}/cmds-guide.adoc[] Repository, command and file interfaces --------------------------------------- @@ -358,7 +358,7 @@ This documentation discusses repository and command interfaces which users are expected to interact with directly. See `--user-formats` in linkgit:git-help[1] for more details on the criteria. -include::{build_dir}/cmds-userinterfaces.txt[] +include::{build_dir}/cmds-userinterfaces.adoc[] File formats, protocols and other developer interfaces ------------------------------------------------------ @@ -367,7 +367,7 @@ This documentation discusses file formats, over-the-wire protocols and other git developer interfaces. See `--developer-interfaces` in linkgit:git-help[1]. -include::{build_dir}/cmds-developerinterfaces.txt[] +include::{build_dir}/cmds-developerinterfaces.adoc[] Configuration Mechanism ----------------------- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.adoc similarity index 100% rename from Documentation/gitattributes.txt rename to Documentation/gitattributes.adoc diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.adoc similarity index 100% rename from Documentation/gitcli.txt rename to Documentation/gitcli.adoc diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.adoc similarity index 100% rename from Documentation/gitcore-tutorial.txt rename to Documentation/gitcore-tutorial.adoc diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.adoc similarity index 100% rename from Documentation/gitcredentials.txt rename to Documentation/gitcredentials.adoc diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.adoc similarity index 100% rename from Documentation/gitcvs-migration.txt rename to Documentation/gitcvs-migration.adoc diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.adoc similarity index 100% rename from Documentation/gitdiffcore.txt rename to Documentation/gitdiffcore.adoc diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.adoc similarity index 100% rename from Documentation/giteveryday.txt rename to Documentation/giteveryday.adoc diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.adoc similarity index 100% rename from Documentation/gitfaq.txt rename to Documentation/gitfaq.adoc diff --git a/Documentation/gitformat-bundle.txt b/Documentation/gitformat-bundle.adoc similarity index 100% rename from Documentation/gitformat-bundle.txt rename to Documentation/gitformat-bundle.adoc diff --git a/Documentation/gitformat-chunk.txt b/Documentation/gitformat-chunk.adoc similarity index 100% rename from Documentation/gitformat-chunk.txt rename to Documentation/gitformat-chunk.adoc diff --git a/Documentation/gitformat-commit-graph.txt b/Documentation/gitformat-commit-graph.adoc similarity index 100% rename from Documentation/gitformat-commit-graph.txt rename to Documentation/gitformat-commit-graph.adoc diff --git a/Documentation/gitformat-index.txt b/Documentation/gitformat-index.adoc similarity index 100% rename from Documentation/gitformat-index.txt rename to Documentation/gitformat-index.adoc diff --git a/Documentation/gitformat-pack.txt b/Documentation/gitformat-pack.adoc similarity index 100% rename from Documentation/gitformat-pack.txt rename to Documentation/gitformat-pack.adoc diff --git a/Documentation/gitformat-signature.txt b/Documentation/gitformat-signature.adoc similarity index 100% rename from Documentation/gitformat-signature.txt rename to Documentation/gitformat-signature.adoc diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.adoc similarity index 90% rename from Documentation/gitglossary.txt rename to Documentation/gitglossary.adoc index 571f640f5c1..0e85be48470 100644 --- a/Documentation/gitglossary.txt +++ b/Documentation/gitglossary.adoc @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -include::glossary-content.txt[] +include::glossary-content.adoc[] SEE ALSO -------- diff --git a/Documentation/githooks.txt b/Documentation/githooks.adoc similarity index 100% rename from Documentation/githooks.txt rename to Documentation/githooks.adoc diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.adoc similarity index 100% rename from Documentation/gitignore.txt rename to Documentation/gitignore.adoc diff --git a/Documentation/gitk.txt b/Documentation/gitk.adoc similarity index 99% rename from Documentation/gitk.txt rename to Documentation/gitk.adoc index 35b39960296..58ce40ddb11 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.adoc @@ -98,7 +98,7 @@ linkgit:git-rev-list[1] for a complete list. (See "History simplification" in linkgit:git-log[1] for a more detailed explanation.) -include::line-range-options.txt[] +include::line-range-options.adoc[] :: diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.adoc similarity index 100% rename from Documentation/gitmailmap.txt rename to Documentation/gitmailmap.adoc diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.adoc similarity index 100% rename from Documentation/gitmodules.txt rename to Documentation/gitmodules.adoc diff --git a/Documentation/gitnamespaces.txt b/Documentation/gitnamespaces.adoc similarity index 98% rename from Documentation/gitnamespaces.txt rename to Documentation/gitnamespaces.adoc index 1c8d2ecc358..06f4d37efa3 100644 --- a/Documentation/gitnamespaces.txt +++ b/Documentation/gitnamespaces.adoc @@ -61,7 +61,7 @@ For a simple local test, you can use linkgit:git-remote-ext[1]: git clone ext::'git --namespace=foo %s /tmp/prefixed.git' ---------- -include::transfer-data-leaks.txt[] +include::transfer-data-leaks.adoc[] GIT --- diff --git a/Documentation/gitpacking.txt b/Documentation/gitpacking.adoc similarity index 99% rename from Documentation/gitpacking.txt rename to Documentation/gitpacking.adoc index 321154d4e65..a56596e2d1d 100644 --- a/Documentation/gitpacking.txt +++ b/Documentation/gitpacking.adoc @@ -136,7 +136,7 @@ chunks of "stableSize" in order of age. The exact configuration for pseudo-merges is as follows: -include::config/bitmap-pseudo-merge.txt[] +include::config/bitmap-pseudo-merge.adoc[] === Examples diff --git a/Documentation/gitprotocol-capabilities.txt b/Documentation/gitprotocol-capabilities.adoc similarity index 100% rename from Documentation/gitprotocol-capabilities.txt rename to Documentation/gitprotocol-capabilities.adoc diff --git a/Documentation/gitprotocol-common.txt b/Documentation/gitprotocol-common.adoc similarity index 100% rename from Documentation/gitprotocol-common.txt rename to Documentation/gitprotocol-common.adoc diff --git a/Documentation/gitprotocol-http.txt b/Documentation/gitprotocol-http.adoc similarity index 100% rename from Documentation/gitprotocol-http.txt rename to Documentation/gitprotocol-http.adoc diff --git a/Documentation/gitprotocol-pack.txt b/Documentation/gitprotocol-pack.adoc similarity index 100% rename from Documentation/gitprotocol-pack.txt rename to Documentation/gitprotocol-pack.adoc diff --git a/Documentation/gitprotocol-v2.txt b/Documentation/gitprotocol-v2.adoc similarity index 100% rename from Documentation/gitprotocol-v2.txt rename to Documentation/gitprotocol-v2.adoc diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.adoc similarity index 100% rename from Documentation/gitremote-helpers.txt rename to Documentation/gitremote-helpers.adoc diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.adoc similarity index 99% rename from Documentation/gitrepository-layout.txt rename to Documentation/gitrepository-layout.adoc index fa8b51daf08..c77f474311c 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.adoc @@ -292,7 +292,7 @@ worktrees//locked:: worktrees//config.worktree:: Working directory specific configuration file. -include::technical/repository-version.txt[] +include::technical/repository-version.adoc[] SEE ALSO -------- diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.adoc similarity index 96% rename from Documentation/gitrevisions.txt rename to Documentation/gitrevisions.adoc index d407b7dee12..7146117de5f 100644 --- a/Documentation/gitrevisions.txt +++ b/Documentation/gitrevisions.adoc @@ -24,7 +24,7 @@ linkgit:git-push[1]) can also take revision parameters which denote other objects than commits, e.g. blobs ("files") or trees ("directories of files"). -include::revisions.txt[] +include::revisions.adoc[] SEE ALSO diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.adoc similarity index 100% rename from Documentation/gitsubmodules.txt rename to Documentation/gitsubmodules.adoc diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.adoc similarity index 100% rename from Documentation/gittutorial-2.txt rename to Documentation/gittutorial-2.adoc diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.adoc similarity index 100% rename from Documentation/gittutorial.txt rename to Documentation/gittutorial.adoc diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.adoc similarity index 100% rename from Documentation/gitweb.txt rename to Documentation/gitweb.adoc diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.adoc similarity index 100% rename from Documentation/gitweb.conf.txt rename to Documentation/gitweb.conf.adoc diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.adoc similarity index 100% rename from Documentation/gitworkflows.txt rename to Documentation/gitworkflows.adoc diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.adoc similarity index 100% rename from Documentation/glossary-content.txt rename to Documentation/glossary-content.adoc diff --git a/Documentation/howto/coordinate-embargoed-releases.txt b/Documentation/howto/coordinate-embargoed-releases.adoc similarity index 100% rename from Documentation/howto/coordinate-embargoed-releases.txt rename to Documentation/howto/coordinate-embargoed-releases.adoc diff --git a/Documentation/howto/keep-canonical-history-correct.txt b/Documentation/howto/keep-canonical-history-correct.adoc similarity index 100% rename from Documentation/howto/keep-canonical-history-correct.txt rename to Documentation/howto/keep-canonical-history-correct.adoc diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.adoc similarity index 100% rename from Documentation/howto/maintain-git.txt rename to Documentation/howto/maintain-git.adoc diff --git a/Documentation/howto/new-command.txt b/Documentation/howto/new-command.adoc similarity index 100% rename from Documentation/howto/new-command.txt rename to Documentation/howto/new-command.adoc diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.adoc similarity index 100% rename from Documentation/howto/rebase-from-internal-branch.txt rename to Documentation/howto/rebase-from-internal-branch.adoc diff --git a/Documentation/howto/rebuild-from-update-hook.txt b/Documentation/howto/rebuild-from-update-hook.adoc similarity index 100% rename from Documentation/howto/rebuild-from-update-hook.txt rename to Documentation/howto/rebuild-from-update-hook.adoc diff --git a/Documentation/howto/recover-corrupted-blob-object.txt b/Documentation/howto/recover-corrupted-blob-object.adoc similarity index 100% rename from Documentation/howto/recover-corrupted-blob-object.txt rename to Documentation/howto/recover-corrupted-blob-object.adoc diff --git a/Documentation/howto/recover-corrupted-object-harder.txt b/Documentation/howto/recover-corrupted-object-harder.adoc similarity index 100% rename from Documentation/howto/recover-corrupted-object-harder.txt rename to Documentation/howto/recover-corrupted-object-harder.adoc diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.adoc similarity index 100% rename from Documentation/howto/revert-a-faulty-merge.txt rename to Documentation/howto/revert-a-faulty-merge.adoc diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.adoc similarity index 100% rename from Documentation/howto/revert-branch-rebase.txt rename to Documentation/howto/revert-branch-rebase.adoc diff --git a/Documentation/howto/separating-topic-branches.txt b/Documentation/howto/separating-topic-branches.adoc similarity index 100% rename from Documentation/howto/separating-topic-branches.txt rename to Documentation/howto/separating-topic-branches.adoc diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.adoc similarity index 100% rename from Documentation/howto/setup-git-server-over-http.txt rename to Documentation/howto/setup-git-server-over-http.adoc diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.adoc similarity index 100% rename from Documentation/howto/update-hook-example.txt rename to Documentation/howto/update-hook-example.adoc diff --git a/Documentation/howto/use-git-daemon.txt b/Documentation/howto/use-git-daemon.adoc similarity index 100% rename from Documentation/howto/use-git-daemon.txt rename to Documentation/howto/use-git-daemon.adoc diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.adoc similarity index 100% rename from Documentation/howto/using-merge-subtree.txt rename to Documentation/howto/using-merge-subtree.adoc diff --git a/Documentation/howto/using-signed-tag-in-pull-request.txt b/Documentation/howto/using-signed-tag-in-pull-request.adoc similarity index 100% rename from Documentation/howto/using-signed-tag-in-pull-request.txt rename to Documentation/howto/using-signed-tag-in-pull-request.adoc diff --git a/Documentation/i18n.txt b/Documentation/i18n.adoc similarity index 100% rename from Documentation/i18n.txt rename to Documentation/i18n.adoc diff --git a/Documentation/includes/cmd-config-section-all.txt b/Documentation/includes/cmd-config-section-all.adoc similarity index 100% rename from Documentation/includes/cmd-config-section-all.txt rename to Documentation/includes/cmd-config-section-all.adoc diff --git a/Documentation/includes/cmd-config-section-rest.txt b/Documentation/includes/cmd-config-section-rest.adoc similarity index 100% rename from Documentation/includes/cmd-config-section-rest.txt rename to Documentation/includes/cmd-config-section-rest.adoc diff --git a/Documentation/install-webdoc.sh b/Documentation/install-webdoc.sh index ed8b4ff3e58..b237b311c34 100755 --- a/Documentation/install-webdoc.sh +++ b/Documentation/install-webdoc.sh @@ -3,10 +3,10 @@ T="$1" for h in \ - *.txt *.html \ - howto/*.txt howto/*.html \ - technical/*.txt technical/*.html \ - RelNotes/*.txt *.css + *.adoc *.html \ + howto/*.adoc howto/*.html \ + technical/*.adoc technical/*.html \ + RelNotes/*.adoc *.css do if test ! -f "$h" then @@ -24,13 +24,13 @@ do done strip_leading=$(echo "$T/" | sed -e 's|.|.|g') for th in \ - "$T"/*.html "$T"/*.txt \ - "$T"/howto/*.txt "$T"/howto/*.html \ - "$T"/technical/*.txt "$T"/technical/*.html + "$T"/*.html "$T"/*.adoc \ + "$T"/howto/*.adoc "$T"/howto/*.html \ + "$T"/technical/*.adoc "$T"/technical/*.html do h=$(expr "$th" : "$strip_leading"'\(.*\)') case "$h" in - RelNotes-*.txt | index.html) continue ;; + RelNotes-*.adoc | index.html) continue ;; esac test -f "$h" && continue echo >&2 "# rm -f $th" diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.adoc similarity index 100% rename from Documentation/line-range-format.txt rename to Documentation/line-range-format.adoc diff --git a/Documentation/line-range-options.txt b/Documentation/line-range-options.adoc similarity index 95% rename from Documentation/line-range-options.txt rename to Documentation/line-range-options.adoc index 8e295a62b80..f275df3b69f 100644 --- a/Documentation/line-range-options.txt +++ b/Documentation/line-range-options.adoc @@ -12,4 +12,4 @@ (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented. + -include::line-range-format.txt[] +include::line-range-format.adoc[] diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl index 1c61dd9512b..aea564dad7e 100755 --- a/Documentation/lint-gitlink.perl +++ b/Documentation/lint-gitlink.perl @@ -5,7 +5,7 @@ # Parse arguments, a simple state machine for input like: # -# --section=1 git.txt git-add.txt [...] --to-lint git-add.txt a-file.txt [...] +# --section=1 git.adoc git-add.adoc [...] --to-lint git-add.adoc a-file.adoc [...] my %TXT; my %SECTION; my $section; @@ -17,7 +17,7 @@ next; } - my ($name) = $arg =~ /^(.*?)\.txt$/s; + my ($name) = $arg =~ /^(.*?)\.adoc$/s; unless (defined $section) { $TXT{$name} = $arg; next; diff --git a/Documentation/lint-manpages.sh b/Documentation/lint-manpages.sh index 92cfc0a15ab..a0ea572382d 100755 --- a/Documentation/lint-manpages.sh +++ b/Documentation/lint-manpages.sh @@ -31,7 +31,7 @@ check_missing_docs () ( git-?*--?* ) continue ;; esac - if ! test -f "$v.txt" + if ! test -f "$v.adoc" then echo "no doc: $v" ret=1 @@ -63,9 +63,9 @@ check_extraneous_docs () { -e 's/[ ].*//' \ -e 's/^/listed /' ../command-list.txt make print-man1 | - grep '\.txt$' | + grep '\.adoc$' | sed -e 's|^|documented |' \ - -e 's/\.txt//' + -e 's/\.adoc//' ) | ( all_commands="$(printf "%s " "$ALL_COMMANDS" "$BUILT_INS" "$EXCLUDED_PROGRAMS" | tr '\n' ' ')" ret=0 diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.adoc similarity index 99% rename from Documentation/merge-options.txt rename to Documentation/merge-options.adoc index 3eaefc4e940..0022185201f 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.adoc @@ -102,7 +102,7 @@ endif::git-pull[] With --no-log do not list one-line descriptions from the actual commits being merged. -include::signoff-option.txt[] +include::signoff-option.adoc[] --stat:: -n:: diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.adoc similarity index 100% rename from Documentation/merge-strategies.txt rename to Documentation/merge-strategies.adoc diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.adoc similarity index 100% rename from Documentation/mergetools/vimdiff.txt rename to Documentation/mergetools/vimdiff.adoc diff --git a/Documentation/meson.build b/Documentation/meson.build index 2a26fa8a5fe..ead8e482131 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -1,207 +1,207 @@ manpages = { # Category 1. - 'git-add.txt' : 1, - 'git-am.txt' : 1, - 'git-annotate.txt' : 1, - 'git-apply.txt' : 1, - 'git-archimport.txt' : 1, - 'git-archive.txt' : 1, - 'git-bisect.txt' : 1, - 'git-blame.txt' : 1, - 'git-branch.txt' : 1, - 'git-bugreport.txt' : 1, - 'git-bundle.txt' : 1, - 'git-cat-file.txt' : 1, - 'git-check-attr.txt' : 1, - 'git-check-ignore.txt' : 1, - 'git-check-mailmap.txt' : 1, - 'git-checkout-index.txt' : 1, - 'git-checkout.txt' : 1, - 'git-check-ref-format.txt' : 1, - 'git-cherry-pick.txt' : 1, - 'git-cherry.txt' : 1, - 'git-citool.txt' : 1, - 'git-clean.txt' : 1, - 'git-clone.txt' : 1, - 'git-column.txt' : 1, - 'git-commit-graph.txt' : 1, - 'git-commit-tree.txt' : 1, - 'git-commit.txt' : 1, - 'git-config.txt' : 1, - 'git-count-objects.txt' : 1, - 'git-credential-cache--daemon.txt' : 1, - 'git-credential-cache.txt' : 1, - 'git-credential-store.txt' : 1, - 'git-credential.txt' : 1, - 'git-cvsexportcommit.txt' : 1, - 'git-cvsimport.txt' : 1, - 'git-cvsserver.txt' : 1, - 'git-daemon.txt' : 1, - 'git-describe.txt' : 1, - 'git-diagnose.txt' : 1, - 'git-diff-files.txt' : 1, - 'git-diff-index.txt' : 1, - 'git-difftool.txt' : 1, - 'git-diff-tree.txt' : 1, - 'git-diff.txt' : 1, - 'git-fast-export.txt' : 1, - 'git-fast-import.txt' : 1, - 'git-fetch-pack.txt' : 1, - 'git-fetch.txt' : 1, - 'git-filter-branch.txt' : 1, - 'git-fmt-merge-msg.txt' : 1, - 'git-for-each-ref.txt' : 1, - 'git-for-each-repo.txt' : 1, - 'git-format-patch.txt' : 1, - 'git-fsck-objects.txt' : 1, - 'git-fsck.txt' : 1, - 'git-fsmonitor--daemon.txt' : 1, - 'git-gc.txt' : 1, - 'git-get-tar-commit-id.txt' : 1, - 'git-grep.txt' : 1, - 'git-gui.txt' : 1, - 'git-hash-object.txt' : 1, - 'git-help.txt' : 1, - 'git-hook.txt' : 1, - 'git-http-backend.txt' : 1, - 'git-http-fetch.txt' : 1, - 'git-http-push.txt' : 1, - 'git-imap-send.txt' : 1, - 'git-index-pack.txt' : 1, - 'git-init-db.txt' : 1, - 'git-init.txt' : 1, - 'git-instaweb.txt' : 1, - 'git-interpret-trailers.txt' : 1, - 'git-log.txt' : 1, - 'git-ls-files.txt' : 1, - 'git-ls-remote.txt' : 1, - 'git-ls-tree.txt' : 1, - 'git-mailinfo.txt' : 1, - 'git-mailsplit.txt' : 1, - 'git-maintenance.txt' : 1, - 'git-merge-base.txt' : 1, - 'git-merge-file.txt' : 1, - 'git-merge-index.txt' : 1, - 'git-merge-one-file.txt' : 1, - 'git-mergetool--lib.txt' : 1, - 'git-mergetool.txt' : 1, - 'git-merge-tree.txt' : 1, - 'git-merge.txt' : 1, - 'git-mktag.txt' : 1, - 'git-mktree.txt' : 1, - 'git-multi-pack-index.txt' : 1, - 'git-mv.txt' : 1, - 'git-name-rev.txt' : 1, - 'git-notes.txt' : 1, - 'git-p4.txt' : 1, - 'git-pack-objects.txt' : 1, - 'git-pack-redundant.txt' : 1, - 'git-pack-refs.txt' : 1, - 'git-patch-id.txt' : 1, - 'git-prune-packed.txt' : 1, - 'git-prune.txt' : 1, - 'git-pull.txt' : 1, - 'git-push.txt' : 1, - 'git-quiltimport.txt' : 1, - 'git-range-diff.txt' : 1, - 'git-read-tree.txt' : 1, - 'git-rebase.txt' : 1, - 'git-receive-pack.txt' : 1, - 'git-reflog.txt' : 1, - 'git-refs.txt' : 1, - 'git-remote-ext.txt' : 1, - 'git-remote-fd.txt' : 1, - 'git-remote.txt' : 1, - 'git-repack.txt' : 1, - 'git-replace.txt' : 1, - 'git-replay.txt' : 1, - 'git-request-pull.txt' : 1, - 'git-rerere.txt' : 1, - 'git-reset.txt' : 1, - 'git-restore.txt' : 1, - 'git-revert.txt' : 1, - 'git-rev-list.txt' : 1, - 'git-rev-parse.txt' : 1, - 'git-rm.txt' : 1, - 'git-send-email.txt' : 1, - 'git-send-pack.txt' : 1, - 'git-shell.txt' : 1, - 'git-sh-i18n--envsubst.txt' : 1, - 'git-sh-i18n.txt' : 1, - 'git-shortlog.txt' : 1, - 'git-show-branch.txt' : 1, - 'git-show-index.txt' : 1, - 'git-show-ref.txt' : 1, - 'git-show.txt' : 1, - 'git-sh-setup.txt' : 1, - 'git-sparse-checkout.txt' : 1, - 'git-stage.txt' : 1, - 'git-stash.txt' : 1, - 'git-status.txt' : 1, - 'git-stripspace.txt' : 1, - 'git-submodule.txt' : 1, - 'git-svn.txt' : 1, - 'git-switch.txt' : 1, - 'git-symbolic-ref.txt' : 1, - 'git-tag.txt' : 1, - 'git-unpack-file.txt' : 1, - 'git-unpack-objects.txt' : 1, - 'git-update-index.txt' : 1, - 'git-update-ref.txt' : 1, - 'git-update-server-info.txt' : 1, - 'git-upload-archive.txt' : 1, - 'git-upload-pack.txt' : 1, - 'git-var.txt' : 1, - 'git-verify-commit.txt' : 1, - 'git-verify-pack.txt' : 1, - 'git-verify-tag.txt' : 1, - 'git-version.txt' : 1, - 'git-web--browse.txt' : 1, - 'git-whatchanged.txt' : 1, - 'git-worktree.txt' : 1, - 'git-write-tree.txt' : 1, - 'git.txt' : 1, - 'gitk.txt' : 1, - 'gitweb.txt' : 1, - 'scalar.txt' : 1, + 'git-add.adoc' : 1, + 'git-am.adoc' : 1, + 'git-annotate.adoc' : 1, + 'git-apply.adoc' : 1, + 'git-archimport.adoc' : 1, + 'git-archive.adoc' : 1, + 'git-bisect.adoc' : 1, + 'git-blame.adoc' : 1, + 'git-branch.adoc' : 1, + 'git-bugreport.adoc' : 1, + 'git-bundle.adoc' : 1, + 'git-cat-file.adoc' : 1, + 'git-check-attr.adoc' : 1, + 'git-check-ignore.adoc' : 1, + 'git-check-mailmap.adoc' : 1, + 'git-checkout-index.adoc' : 1, + 'git-checkout.adoc' : 1, + 'git-check-ref-format.adoc' : 1, + 'git-cherry-pick.adoc' : 1, + 'git-cherry.adoc' : 1, + 'git-citool.adoc' : 1, + 'git-clean.adoc' : 1, + 'git-clone.adoc' : 1, + 'git-column.adoc' : 1, + 'git-commit-graph.adoc' : 1, + 'git-commit-tree.adoc' : 1, + 'git-commit.adoc' : 1, + 'git-config.adoc' : 1, + 'git-count-objects.adoc' : 1, + 'git-credential-cache--daemon.adoc' : 1, + 'git-credential-cache.adoc' : 1, + 'git-credential-store.adoc' : 1, + 'git-credential.adoc' : 1, + 'git-cvsexportcommit.adoc' : 1, + 'git-cvsimport.adoc' : 1, + 'git-cvsserver.adoc' : 1, + 'git-daemon.adoc' : 1, + 'git-describe.adoc' : 1, + 'git-diagnose.adoc' : 1, + 'git-diff-files.adoc' : 1, + 'git-diff-index.adoc' : 1, + 'git-difftool.adoc' : 1, + 'git-diff-tree.adoc' : 1, + 'git-diff.adoc' : 1, + 'git-fast-export.adoc' : 1, + 'git-fast-import.adoc' : 1, + 'git-fetch-pack.adoc' : 1, + 'git-fetch.adoc' : 1, + 'git-filter-branch.adoc' : 1, + 'git-fmt-merge-msg.adoc' : 1, + 'git-for-each-ref.adoc' : 1, + 'git-for-each-repo.adoc' : 1, + 'git-format-patch.adoc' : 1, + 'git-fsck-objects.adoc' : 1, + 'git-fsck.adoc' : 1, + 'git-fsmonitor--daemon.adoc' : 1, + 'git-gc.adoc' : 1, + 'git-get-tar-commit-id.adoc' : 1, + 'git-grep.adoc' : 1, + 'git-gui.adoc' : 1, + 'git-hash-object.adoc' : 1, + 'git-help.adoc' : 1, + 'git-hook.adoc' : 1, + 'git-http-backend.adoc' : 1, + 'git-http-fetch.adoc' : 1, + 'git-http-push.adoc' : 1, + 'git-imap-send.adoc' : 1, + 'git-index-pack.adoc' : 1, + 'git-init-db.adoc' : 1, + 'git-init.adoc' : 1, + 'git-instaweb.adoc' : 1, + 'git-interpret-trailers.adoc' : 1, + 'git-log.adoc' : 1, + 'git-ls-files.adoc' : 1, + 'git-ls-remote.adoc' : 1, + 'git-ls-tree.adoc' : 1, + 'git-mailinfo.adoc' : 1, + 'git-mailsplit.adoc' : 1, + 'git-maintenance.adoc' : 1, + 'git-merge-base.adoc' : 1, + 'git-merge-file.adoc' : 1, + 'git-merge-index.adoc' : 1, + 'git-merge-one-file.adoc' : 1, + 'git-mergetool--lib.adoc' : 1, + 'git-mergetool.adoc' : 1, + 'git-merge-tree.adoc' : 1, + 'git-merge.adoc' : 1, + 'git-mktag.adoc' : 1, + 'git-mktree.adoc' : 1, + 'git-multi-pack-index.adoc' : 1, + 'git-mv.adoc' : 1, + 'git-name-rev.adoc' : 1, + 'git-notes.adoc' : 1, + 'git-p4.adoc' : 1, + 'git-pack-objects.adoc' : 1, + 'git-pack-redundant.adoc' : 1, + 'git-pack-refs.adoc' : 1, + 'git-patch-id.adoc' : 1, + 'git-prune-packed.adoc' : 1, + 'git-prune.adoc' : 1, + 'git-pull.adoc' : 1, + 'git-push.adoc' : 1, + 'git-quiltimport.adoc' : 1, + 'git-range-diff.adoc' : 1, + 'git-read-tree.adoc' : 1, + 'git-rebase.adoc' : 1, + 'git-receive-pack.adoc' : 1, + 'git-reflog.adoc' : 1, + 'git-refs.adoc' : 1, + 'git-remote-ext.adoc' : 1, + 'git-remote-fd.adoc' : 1, + 'git-remote.adoc' : 1, + 'git-repack.adoc' : 1, + 'git-replace.adoc' : 1, + 'git-replay.adoc' : 1, + 'git-request-pull.adoc' : 1, + 'git-rerere.adoc' : 1, + 'git-reset.adoc' : 1, + 'git-restore.adoc' : 1, + 'git-revert.adoc' : 1, + 'git-rev-list.adoc' : 1, + 'git-rev-parse.adoc' : 1, + 'git-rm.adoc' : 1, + 'git-send-email.adoc' : 1, + 'git-send-pack.adoc' : 1, + 'git-shell.adoc' : 1, + 'git-sh-i18n--envsubst.adoc' : 1, + 'git-sh-i18n.adoc' : 1, + 'git-shortlog.adoc' : 1, + 'git-show-branch.adoc' : 1, + 'git-show-index.adoc' : 1, + 'git-show-ref.adoc' : 1, + 'git-show.adoc' : 1, + 'git-sh-setup.adoc' : 1, + 'git-sparse-checkout.adoc' : 1, + 'git-stage.adoc' : 1, + 'git-stash.adoc' : 1, + 'git-status.adoc' : 1, + 'git-stripspace.adoc' : 1, + 'git-submodule.adoc' : 1, + 'git-svn.adoc' : 1, + 'git-switch.adoc' : 1, + 'git-symbolic-ref.adoc' : 1, + 'git-tag.adoc' : 1, + 'git-unpack-file.adoc' : 1, + 'git-unpack-objects.adoc' : 1, + 'git-update-index.adoc' : 1, + 'git-update-ref.adoc' : 1, + 'git-update-server-info.adoc' : 1, + 'git-upload-archive.adoc' : 1, + 'git-upload-pack.adoc' : 1, + 'git-var.adoc' : 1, + 'git-verify-commit.adoc' : 1, + 'git-verify-pack.adoc' : 1, + 'git-verify-tag.adoc' : 1, + 'git-version.adoc' : 1, + 'git-web--browse.adoc' : 1, + 'git-whatchanged.adoc' : 1, + 'git-worktree.adoc' : 1, + 'git-write-tree.adoc' : 1, + 'git.adoc' : 1, + 'gitk.adoc' : 1, + 'gitweb.adoc' : 1, + 'scalar.adoc' : 1, # Category 5. - 'gitattributes.txt' : 5, - 'gitformat-bundle.txt' : 5, - 'gitformat-chunk.txt' : 5, - 'gitformat-commit-graph.txt' : 5, - 'gitformat-index.txt' : 5, - 'gitformat-pack.txt' : 5, - 'gitformat-signature.txt' : 5, - 'githooks.txt' : 5, - 'gitignore.txt' : 5, - 'gitmailmap.txt' : 5, - 'gitmodules.txt' : 5, - 'gitprotocol-capabilities.txt' : 5, - 'gitprotocol-common.txt' : 5, - 'gitprotocol-http.txt' : 5, - 'gitprotocol-pack.txt' : 5, - 'gitprotocol-v2.txt' : 5, - 'gitrepository-layout.txt' : 5, - 'gitweb.conf.txt' : 5, + 'gitattributes.adoc' : 5, + 'gitformat-bundle.adoc' : 5, + 'gitformat-chunk.adoc' : 5, + 'gitformat-commit-graph.adoc' : 5, + 'gitformat-index.adoc' : 5, + 'gitformat-pack.adoc' : 5, + 'gitformat-signature.adoc' : 5, + 'githooks.adoc' : 5, + 'gitignore.adoc' : 5, + 'gitmailmap.adoc' : 5, + 'gitmodules.adoc' : 5, + 'gitprotocol-capabilities.adoc' : 5, + 'gitprotocol-common.adoc' : 5, + 'gitprotocol-http.adoc' : 5, + 'gitprotocol-pack.adoc' : 5, + 'gitprotocol-v2.adoc' : 5, + 'gitrepository-layout.adoc' : 5, + 'gitweb.conf.adoc' : 5, # Category 7. - 'gitcli.txt' : 7, - 'gitcore-tutorial.txt' : 7, - 'gitcredentials.txt' : 7, - 'gitcvs-migration.txt' : 7, - 'gitdiffcore.txt' : 7, - 'giteveryday.txt' : 7, - 'gitfaq.txt' : 7, - 'gitglossary.txt' : 7, - 'gitpacking.txt' : 7, - 'gitnamespaces.txt' : 7, - 'gitremote-helpers.txt' : 7, - 'gitrevisions.txt' : 7, - 'gitsubmodules.txt' : 7, - 'gittutorial-2.txt' : 7, - 'gittutorial.txt' : 7, - 'gitworkflows.txt' : 7, + 'gitcli.adoc' : 7, + 'gitcore-tutorial.adoc' : 7, + 'gitcredentials.adoc' : 7, + 'gitcvs-migration.adoc' : 7, + 'gitdiffcore.adoc' : 7, + 'giteveryday.adoc' : 7, + 'gitfaq.adoc' : 7, + 'gitglossary.adoc' : 7, + 'gitpacking.adoc' : 7, + 'gitnamespaces.adoc' : 7, + 'gitremote-helpers.adoc' : 7, + 'gitrevisions.adoc' : 7, + 'gitsubmodules.adoc' : 7, + 'gittutorial-2.adoc' : 7, + 'gittutorial.adoc' : 7, + 'gitworkflows.adoc' : 7, } docs_backend = get_option('docs_backend') @@ -287,18 +287,18 @@ git = find_program('git', required: false) xmlto = find_program('xmlto') cmd_lists = [ - 'cmds-ancillaryinterrogators.txt', - 'cmds-ancillarymanipulators.txt', - 'cmds-mainporcelain.txt', - 'cmds-plumbinginterrogators.txt', - 'cmds-plumbingmanipulators.txt', - 'cmds-synchingrepositories.txt', - 'cmds-synchelpers.txt', - 'cmds-guide.txt', - 'cmds-developerinterfaces.txt', - 'cmds-userinterfaces.txt', - 'cmds-purehelpers.txt', - 'cmds-foreignscminterface.txt', + 'cmds-ancillaryinterrogators.adoc', + 'cmds-ancillarymanipulators.adoc', + 'cmds-mainporcelain.adoc', + 'cmds-plumbinginterrogators.adoc', + 'cmds-plumbingmanipulators.adoc', + 'cmds-synchingrepositories.adoc', + 'cmds-synchelpers.adoc', + 'cmds-guide.adoc', + 'cmds-developerinterfaces.adoc', + 'cmds-userinterfaces.adoc', + 'cmds-purehelpers.adoc', + 'cmds-foreignscminterface.adoc', ] documentation_deps += custom_target( @@ -325,7 +325,7 @@ foreach mode : [ 'diff', 'merge' ] 'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools', ], input: 'generate-mergetool-list.sh', - output: 'mergetools-' + mode + '.txt', + output: 'mergetools-' + mode + '.adoc', ) endforeach @@ -414,7 +414,7 @@ if get_option('docs').contains('html') '--out-file=@OUTPUT@', '@INPUT@', ], - input: 'user-manual.txt', + input: 'user-manual.adoc', output: 'user-manual.xml', depends: documentation_deps, ) @@ -436,14 +436,14 @@ if get_option('docs').contains('html') ) articles = [ - 'DecisionMaking.txt', - 'MyFirstContribution.txt', - 'MyFirstObjectWalk.txt', - 'ReviewingGuidelines.txt', + 'DecisionMaking.adoc', + 'MyFirstContribution.adoc', + 'MyFirstObjectWalk.adoc', + 'ReviewingGuidelines.adoc', 'SubmittingPatches', - 'ToolsForGit.txt', - 'git-bisect-lk2009.txt', - 'git-tools.txt', + 'ToolsForGit.adoc', + 'git-bisect-lk2009.adoc', + 'git-tools.adoc', ] foreach article : articles @@ -475,8 +475,8 @@ endif # Sanity check that we are not missing any tests present in 't/'. This check # only runs once at configure time and is thus best-effort, only. Furthermore, # it only verifies man pages for the sake of simplicity. -configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.txt', 'git-tools.txt' ] -actual_manpages = run_command(shell, '-c', 'ls git*.txt scalar.txt', +configured_manpages = manpages.keys() + [ 'git-bisect-lk2009.adoc', 'git-tools.adoc' ] +actual_manpages = run_command(shell, '-c', 'ls git*.adoc scalar.adoc', check: true, env: script_environment, ).stdout().strip().split('\n') diff --git a/Documentation/object-format-disclaimer.txt b/Documentation/object-format-disclaimer.adoc similarity index 100% rename from Documentation/object-format-disclaimer.txt rename to Documentation/object-format-disclaimer.adoc diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.adoc similarity index 100% rename from Documentation/pretty-formats.txt rename to Documentation/pretty-formats.adoc diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.adoc similarity index 100% rename from Documentation/pretty-options.txt rename to Documentation/pretty-options.adoc diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.adoc similarity index 100% rename from Documentation/pull-fetch-param.txt rename to Documentation/pull-fetch-param.adoc diff --git a/Documentation/ref-reachability-filters.txt b/Documentation/ref-reachability-filters.adoc similarity index 100% rename from Documentation/ref-reachability-filters.txt rename to Documentation/ref-reachability-filters.adoc diff --git a/Documentation/ref-storage-format.txt b/Documentation/ref-storage-format.adoc similarity index 100% rename from Documentation/ref-storage-format.txt rename to Documentation/ref-storage-format.adoc diff --git a/Documentation/rerere-options.txt b/Documentation/rerere-options.adoc similarity index 100% rename from Documentation/rerere-options.txt rename to Documentation/rerere-options.adoc diff --git a/Documentation/rev-list-description.txt b/Documentation/rev-list-description.adoc similarity index 100% rename from Documentation/rev-list-description.txt rename to Documentation/rev-list-description.adoc diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.adoc similarity index 99% rename from Documentation/rev-list-options.txt rename to Documentation/rev-list-options.adoc index 459e5a02f52..196b2781cce 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.adoc @@ -1059,7 +1059,7 @@ more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] endif::git-rev-list[] -include::pretty-options.txt[] +include::pretty-options.adoc[] --relative-date:: Synonym for `--date=relative`. diff --git a/Documentation/revisions.txt b/Documentation/revisions.adoc similarity index 100% rename from Documentation/revisions.txt rename to Documentation/revisions.adoc diff --git a/Documentation/scalar.txt b/Documentation/scalar.adoc similarity index 100% rename from Documentation/scalar.txt rename to Documentation/scalar.adoc diff --git a/Documentation/sequencer.txt b/Documentation/sequencer.adoc similarity index 100% rename from Documentation/sequencer.txt rename to Documentation/sequencer.adoc diff --git a/Documentation/signoff-option.txt b/Documentation/signoff-option.adoc similarity index 100% rename from Documentation/signoff-option.txt rename to Documentation/signoff-option.adoc diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.adoc similarity index 100% rename from Documentation/technical/api-error-handling.txt rename to Documentation/technical/api-error-handling.adoc diff --git a/Documentation/technical/api-index-skel.txt b/Documentation/technical/api-index-skel.adoc similarity index 100% rename from Documentation/technical/api-index-skel.txt rename to Documentation/technical/api-index-skel.adoc diff --git a/Documentation/technical/api-index.sh b/Documentation/technical/api-index.sh index 29648855743..dd206b1ca49 100755 --- a/Documentation/technical/api-index.sh +++ b/Documentation/technical/api-index.sh @@ -13,18 +13,18 @@ OUTPUT="$2" cd "$SOURCE_DIR" c=//////////////////////////////////////////////////////////////// - skel=api-index-skel.txt + skel=api-index-skel.adoc sed -e '/^\/\/ table of contents begin/q' "$skel" echo "$c" - ls api-*.txt | + ls api-*.adoc | while read filename do case "$filename" in - api-index-skel.txt | api-index.txt) continue ;; + api-index-skel.adoc | api-index.adoc) continue ;; esac title=$(sed -e 1q "$filename") - html=${filename%.txt}.html + html=${filename%.adoc}.html echo "* link:$html[$title]" done echo "$c" diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.adoc similarity index 100% rename from Documentation/technical/api-merge.txt rename to Documentation/technical/api-merge.adoc diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.adoc similarity index 100% rename from Documentation/technical/api-parse-options.txt rename to Documentation/technical/api-parse-options.adoc diff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.adoc similarity index 100% rename from Documentation/technical/api-simple-ipc.txt rename to Documentation/technical/api-simple-ipc.adoc diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.adoc similarity index 99% rename from Documentation/technical/api-trace2.txt rename to Documentation/technical/api-trace2.adoc index 5817b18310c..cf493dae03f 100644 --- a/Documentation/technical/api-trace2.txt +++ b/Documentation/technical/api-trace2.adoc @@ -140,7 +140,7 @@ $ cat ~/log.event To enable a target, set the corresponding environment variable or system or global config value to one of the following: -include::../trace2-target-values.txt[] +include::../trace2-target-values.adoc[] When trace files are written to a target directory, they will be named according to the last component of the SID (optionally followed by a counter to avoid diff --git a/Documentation/technical/bitmap-format.txt b/Documentation/technical/bitmap-format.adoc similarity index 100% rename from Documentation/technical/bitmap-format.txt rename to Documentation/technical/bitmap-format.adoc diff --git a/Documentation/technical/build-systems.txt b/Documentation/technical/build-systems.adoc similarity index 100% rename from Documentation/technical/build-systems.txt rename to Documentation/technical/build-systems.adoc diff --git a/Documentation/technical/bundle-uri.txt b/Documentation/technical/bundle-uri.adoc similarity index 100% rename from Documentation/technical/bundle-uri.txt rename to Documentation/technical/bundle-uri.adoc diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.adoc similarity index 100% rename from Documentation/technical/commit-graph.txt rename to Documentation/technical/commit-graph.adoc diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.adoc similarity index 100% rename from Documentation/technical/directory-rename-detection.txt rename to Documentation/technical/directory-rename-detection.adoc diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.adoc similarity index 100% rename from Documentation/technical/hash-function-transition.txt rename to Documentation/technical/hash-function-transition.adoc diff --git a/Documentation/technical/long-running-process-protocol.txt b/Documentation/technical/long-running-process-protocol.adoc similarity index 100% rename from Documentation/technical/long-running-process-protocol.txt rename to Documentation/technical/long-running-process-protocol.adoc diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.adoc similarity index 100% rename from Documentation/technical/multi-pack-index.txt rename to Documentation/technical/multi-pack-index.adoc diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.adoc similarity index 100% rename from Documentation/technical/pack-heuristics.txt rename to Documentation/technical/pack-heuristics.adoc diff --git a/Documentation/technical/packfile-uri.txt b/Documentation/technical/packfile-uri.adoc similarity index 100% rename from Documentation/technical/packfile-uri.txt rename to Documentation/technical/packfile-uri.adoc diff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.adoc similarity index 100% rename from Documentation/technical/parallel-checkout.txt rename to Documentation/technical/parallel-checkout.adoc diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.adoc similarity index 100% rename from Documentation/technical/partial-clone.txt rename to Documentation/technical/partial-clone.adoc diff --git a/Documentation/technical/platform-support.txt b/Documentation/technical/platform-support.adoc similarity index 100% rename from Documentation/technical/platform-support.txt rename to Documentation/technical/platform-support.adoc diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.adoc similarity index 100% rename from Documentation/technical/racy-git.txt rename to Documentation/technical/racy-git.adoc diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.adoc similarity index 100% rename from Documentation/technical/reftable.txt rename to Documentation/technical/reftable.adoc diff --git a/Documentation/technical/remembering-renames.txt b/Documentation/technical/remembering-renames.adoc similarity index 100% rename from Documentation/technical/remembering-renames.txt rename to Documentation/technical/remembering-renames.adoc diff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.adoc similarity index 100% rename from Documentation/technical/repository-version.txt rename to Documentation/technical/repository-version.adoc diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.adoc similarity index 100% rename from Documentation/technical/rerere.txt rename to Documentation/technical/rerere.adoc diff --git a/Documentation/technical/scalar.txt b/Documentation/technical/scalar.adoc similarity index 100% rename from Documentation/technical/scalar.txt rename to Documentation/technical/scalar.adoc diff --git a/Documentation/technical/send-pack-pipeline.txt b/Documentation/technical/send-pack-pipeline.adoc similarity index 100% rename from Documentation/technical/send-pack-pipeline.txt rename to Documentation/technical/send-pack-pipeline.adoc diff --git a/Documentation/technical/shallow.txt b/Documentation/technical/shallow.adoc similarity index 100% rename from Documentation/technical/shallow.txt rename to Documentation/technical/shallow.adoc diff --git a/Documentation/technical/sparse-checkout.txt b/Documentation/technical/sparse-checkout.adoc similarity index 100% rename from Documentation/technical/sparse-checkout.txt rename to Documentation/technical/sparse-checkout.adoc diff --git a/Documentation/technical/sparse-index.txt b/Documentation/technical/sparse-index.adoc similarity index 100% rename from Documentation/technical/sparse-index.txt rename to Documentation/technical/sparse-index.adoc diff --git a/Documentation/technical/trivial-merge.txt b/Documentation/technical/trivial-merge.adoc similarity index 100% rename from Documentation/technical/trivial-merge.txt rename to Documentation/technical/trivial-merge.adoc diff --git a/Documentation/technical/unit-tests.txt b/Documentation/technical/unit-tests.adoc similarity index 100% rename from Documentation/technical/unit-tests.txt rename to Documentation/technical/unit-tests.adoc diff --git a/Documentation/trace2-target-values.txt b/Documentation/trace2-target-values.adoc similarity index 100% rename from Documentation/trace2-target-values.txt rename to Documentation/trace2-target-values.adoc diff --git a/Documentation/transfer-data-leaks.txt b/Documentation/transfer-data-leaks.adoc similarity index 100% rename from Documentation/transfer-data-leaks.txt rename to Documentation/transfer-data-leaks.adoc diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.adoc similarity index 99% rename from Documentation/urls-remotes.txt rename to Documentation/urls-remotes.adoc index bf170122415..9b101511988 100644 --- a/Documentation/urls-remotes.txt +++ b/Documentation/urls-remotes.adoc @@ -1,4 +1,4 @@ -include::urls.txt[] +include::urls.adoc[] REMOTES[[REMOTES]] ------------------ diff --git a/Documentation/urls.txt b/Documentation/urls.adoc similarity index 100% rename from Documentation/urls.txt rename to Documentation/urls.adoc diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.adoc similarity index 99% rename from Documentation/user-manual.txt rename to Documentation/user-manual.adoc index 90a41893583..d2b478ad232 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.adoc @@ -4354,7 +4354,7 @@ itself! [[git-explained]] === Git explained -include::glossary-content.txt[] +include::glossary-content.adoc[] [[git-quick-start]] [appendix] diff --git a/Makefile b/Makefile index 97e8385b664..0c1acbfe71b 100644 --- a/Makefile +++ b/Makefile @@ -2528,17 +2528,17 @@ $(BUILT_INS): git$X config-list.h: generate-configlist.sh -config-list.h: Documentation/*config.txt Documentation/config/*.txt +config-list.h: Documentation/*config.adoc Documentation/config/*.adoc $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@ command-list.h: generate-cmdlist.sh command-list.txt -command-list.h: $(wildcard Documentation/git*.txt) +command-list.h: $(wildcard Documentation/git*.adoc) $(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \ $(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \ . $@ -hook-list.h: generate-hooklist.sh Documentation/githooks.txt +hook-list.h: generate-hooklist.sh Documentation/githooks.adoc $(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh . $@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\ diff --git a/RelNotes b/RelNotes index 978481996e7..ac72bdf04d1 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.49.0.txt \ No newline at end of file +Documentation/RelNotes/2.49.0.adoc \ No newline at end of file diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index b923a5aab80..0ed39c4c5da 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -76,7 +76,7 @@ print_command_list () { break ;; esac - done <"$1/Documentation/$cmd.txt" + done <"$1/Documentation/$cmd.adoc" printf '\t{ "%s", N_("%s"), 0' "$cmd" "$synopsis" printf " | CAT_%s" $rest diff --git a/generate-configlist.sh b/generate-configlist.sh index 579422619cc..dffdaada8b5 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh @@ -13,7 +13,7 @@ print_config_list () { cat < Date: Mon, 20 Jan 2025 01:56:03 +0000 Subject: [PATCH 021/165] Remove obsolete ".txt" extensions for AsciiDoc files Since we no longer have any AsciiDoc files that end in ".txt", don't modify them with .gitattributes or ignore them with .gitignore. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- .gitattributes | 1 - Documentation/.gitignore | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index b38cfd499b3..43fa883a84f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,7 +7,6 @@ *.py text eol=lf diff=python *.bat text eol=crlf CODE_OF_CONDUCT.md -whitespace -/Documentation/**/*.txt text eol=lf /Documentation/**/*.adoc text eol=lf /command-list.txt text eol=lf /GIT-VERSION-GEN text eol=lf diff --git a/Documentation/.gitignore b/Documentation/.gitignore index abce806398f..dd54cc768a2 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -6,14 +6,10 @@ *.pdf git.info gitman.info -howto-index.txt howto-index.adoc doc.dep -cmds-*.txt cmds-*.adoc -mergetools-*.txt mergetools-*.adoc -SubmittingPatches.txt SubmittingPatches.adoc tmp-doc-diff/ tmp-meson-diff/ -- GitLab From af47976cc044ecfd52105bb45f6a9085b3c8a772 Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Wed, 22 Jan 2025 06:35:47 +0100 Subject: [PATCH 022/165] refs: mark `ref_transaction_update_reflog()` as static The `ref_transaction_update_reflog()` function is only used within 'refs.c', so mark it as static. Reported-by: Junio C Hamano Signed-off-by: Karthik Nayak Signed-off-by: Junio C Hamano --- refs.c | 22 +++++++++++++++------- refs.h | 14 -------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/refs.c b/refs.c index f7b6f0f897e..ad6d7747171 100644 --- a/refs.c +++ b/refs.c @@ -1318,13 +1318,21 @@ int ref_transaction_update(struct ref_transaction *transaction, return 0; } -int ref_transaction_update_reflog(struct ref_transaction *transaction, - const char *refname, - const struct object_id *new_oid, - const struct object_id *old_oid, - const char *committer_info, unsigned int flags, - const char *msg, unsigned int index, - struct strbuf *err) +/* + * Similar to`ref_transaction_update`, but this function is only for adding + * a reflog update. Supports providing custom committer information. The index + * field can be utiltized to order updates as desired. When not used, the + * updates default to being ordered by refname. + */ +static int ref_transaction_update_reflog(struct ref_transaction *transaction, + const char *refname, + const struct object_id *new_oid, + const struct object_id *old_oid, + const char *committer_info, + unsigned int flags, + const char *msg, + unsigned int index, + struct strbuf *err) { struct ref_update *update; diff --git a/refs.h b/refs.h index a0cdd99250e..09be47afbee 100644 --- a/refs.h +++ b/refs.h @@ -771,20 +771,6 @@ int ref_transaction_update(struct ref_transaction *transaction, unsigned int flags, const char *msg, struct strbuf *err); -/* - * Similar to`ref_transaction_update`, but this function is only for adding - * a reflog update. Supports providing custom committer information. The index - * field can be utiltized to order updates as desired. When not used, the - * updates default to being ordered by refname. - */ -int ref_transaction_update_reflog(struct ref_transaction *transaction, - const char *refname, - const struct object_id *new_oid, - const struct object_id *old_oid, - const char *committer_info, unsigned int flags, - const char *msg, unsigned int index, - struct strbuf *err); - /* * Add a reference creation to transaction. new_oid is the value that * the reference should have after the update; it must not be -- GitLab From e7c1b9f1231e49f5e0c5250ec84c68376619f415 Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Wed, 22 Jan 2025 06:35:48 +0100 Subject: [PATCH 023/165] refs: use 'uint64_t' for 'ref_update.index' The 'ref_update.index' variable is used to store an index for a given reference update. This index is used to order the updates in a predetermined order, while the default ordering is alphabetical as per the refname. For large repositories with millions of references, it should be safer to use 'uint64_t'. Let's do that. This also is applied for all other code sections where we store 'index' and pass it around. Reported-by: brian m. carlson Signed-off-by: Karthik Nayak Signed-off-by: Junio C Hamano --- refs.c | 4 ++-- refs/refs-internal.h | 4 ++-- refs/reftable-backend.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index ad6d7747171..ef04f403a6a 100644 --- a/refs.c +++ b/refs.c @@ -1331,7 +1331,7 @@ static int ref_transaction_update_reflog(struct ref_transaction *transaction, const char *committer_info, unsigned int flags, const char *msg, - unsigned int index, + uint64_t index, struct strbuf *err) { struct ref_update *update; @@ -2813,7 +2813,7 @@ static int migrate_one_ref(const char *refname, const char *referent UNUSED, con } struct reflog_migration_data { - unsigned int index; + uint64_t index; const char *refname; struct ref_store *old_refs; struct ref_transaction *transaction; diff --git a/refs/refs-internal.h b/refs/refs-internal.h index aaab711bb96..8894b43d1d1 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -120,7 +120,7 @@ struct ref_update { * when migrating reflogs and we want to ensure we carry over the * same order. */ - unsigned int index; + uint64_t index; /* * If this ref_update was split off of a symref update via @@ -203,7 +203,7 @@ struct ref_transaction { enum ref_transaction_state state; void *backend_data; unsigned int flags; - unsigned int max_index; + uint64_t max_index; }; /* diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 289496058e6..6814c87bc61 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -942,7 +942,7 @@ struct write_transaction_table_arg { size_t updates_nr; size_t updates_alloc; size_t updates_expected; - unsigned int max_index; + uint64_t max_index; }; struct reftable_transaction_data { -- GitLab From 017bd8923986acd4992fd21f3451fdd15ec6edce Mon Sep 17 00:00:00 2001 From: Karthik Nayak Date: Wed, 22 Jan 2025 06:35:49 +0100 Subject: [PATCH 024/165] reftable: prevent 'update_index' changes after adding records The function `reftable_writer_set_limits()` allows updating the 'min_update_index' and 'max_update_index' of a reftable writer. These values are written to both the writer's header and footer. Since the header is written during the first block write, any subsequent changes to the update index would create a mismatch between the header and footer values. The footer would contain the newer values while the header retained the original ones. To protect against this bug, prevent callers from updating these values after any record is written. To do this, modify the function to return an error whenever the limits are modified after any record adds. Check for record adds within `reftable_writer_set_limits()` by checking the `last_key` and `next` variable. The former is updated after each record added, but is reset at certain points. The latter is set after writing the first block. Modify all callers of the function to anticipate a return type and handle it accordingly. Add a unit test to also ensure the function returns the error as expected. Helped-by: Patrick Steinhardt Signed-off-by: Karthik Nayak Signed-off-by: Junio C Hamano --- refs/reftable-backend.c | 20 +++++++++--- reftable/reftable-error.h | 1 + reftable/reftable-writer.h | 24 +++++++++------ reftable/stack.c | 6 ++-- reftable/writer.c | 15 ++++++++- t/unit-tests/t-reftable-stack.c | 54 +++++++++++++++++++++++++++++++-- 6 files changed, 99 insertions(+), 21 deletions(-) diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c index 6814c87bc61..9cfb0cb2672 100644 --- a/refs/reftable-backend.c +++ b/refs/reftable-backend.c @@ -1443,7 +1443,9 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data * multiple entries. Each entry will contain a different update_index, * so set the limits accordingly. */ - reftable_writer_set_limits(writer, ts, ts + arg->max_index); + ret = reftable_writer_set_limits(writer, ts, ts + arg->max_index); + if (ret < 0) + goto done; for (i = 0; i < arg->updates_nr; i++) { struct reftable_transaction_update *tx_update = &arg->updates[i]; @@ -1766,7 +1768,9 @@ static int write_copy_table(struct reftable_writer *writer, void *cb_data) deletion_ts = creation_ts = reftable_stack_next_update_index(arg->be->stack); if (arg->delete_old) creation_ts++; - reftable_writer_set_limits(writer, deletion_ts, creation_ts); + ret = reftable_writer_set_limits(writer, deletion_ts, creation_ts); + if (ret < 0) + goto done; /* * Add the new reference. If this is a rename then we also delete the @@ -2298,7 +2302,9 @@ static int write_reflog_existence_table(struct reftable_writer *writer, if (ret <= 0) goto done; - reftable_writer_set_limits(writer, ts, ts); + ret = reftable_writer_set_limits(writer, ts, ts); + if (ret < 0) + goto done; /* * The existence entry has both old and new object ID set to the @@ -2357,7 +2363,9 @@ static int write_reflog_delete_table(struct reftable_writer *writer, void *cb_da uint64_t ts = reftable_stack_next_update_index(arg->stack); int ret; - reftable_writer_set_limits(writer, ts, ts); + ret = reftable_writer_set_limits(writer, ts, ts); + if (ret < 0) + goto out; ret = reftable_stack_init_log_iterator(arg->stack, &it); if (ret < 0) @@ -2434,7 +2442,9 @@ static int write_reflog_expiry_table(struct reftable_writer *writer, void *cb_da if (arg->records[i].value_type == REFTABLE_LOG_UPDATE) live_records++; - reftable_writer_set_limits(writer, ts, ts); + ret = reftable_writer_set_limits(writer, ts, ts); + if (ret < 0) + return ret; if (!is_null_oid(&arg->update_oid)) { struct reftable_ref_record ref = {0}; diff --git a/reftable/reftable-error.h b/reftable/reftable-error.h index f4048265629..a7e33d964d0 100644 --- a/reftable/reftable-error.h +++ b/reftable/reftable-error.h @@ -30,6 +30,7 @@ enum reftable_error { /* Misuse of the API: * - on writing a record with NULL refname. + * - on writing a record before setting the writer limits. * - on writing a reftable_ref_record outside the table limits * - on writing a ref or log record before the stack's * next_update_inde*x diff --git a/reftable/reftable-writer.h b/reftable/reftable-writer.h index 5f9afa620bb..1ea014d389c 100644 --- a/reftable/reftable-writer.h +++ b/reftable/reftable-writer.h @@ -124,17 +124,21 @@ int reftable_writer_new(struct reftable_writer **out, int (*flush_func)(void *), void *writer_arg, const struct reftable_write_options *opts); -/* Set the range of update indices for the records we will add. When writing a - table into a stack, the min should be at least - reftable_stack_next_update_index(), or REFTABLE_API_ERROR is returned. - - For transactional updates to a stack, typically min==max, and the - update_index can be obtained by inspeciting the stack. When converting an - existing ref database into a single reftable, this would be a range of - update-index timestamps. +/* + * Set the range of update indices for the records we will add. When writing a + * table into a stack, the min should be at least + * reftable_stack_next_update_index(), or REFTABLE_API_ERROR is returned. + * + * For transactional updates to a stack, typically min==max, and the + * update_index can be obtained by inspeciting the stack. When converting an + * existing ref database into a single reftable, this would be a range of + * update-index timestamps. + * + * The function should be called before adding any records to the writer. If not + * it will fail with REFTABLE_API_ERROR. */ -void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min, - uint64_t max); +int reftable_writer_set_limits(struct reftable_writer *w, uint64_t min, + uint64_t max); /* Add a reftable_ref_record. The record should have names that come after diff --git a/reftable/stack.c b/reftable/stack.c index 531660a49f0..9649dbbb04c 100644 --- a/reftable/stack.c +++ b/reftable/stack.c @@ -1058,8 +1058,10 @@ static int stack_write_compact(struct reftable_stack *st, for (size_t i = first; i <= last; i++) st->stats.bytes += st->readers[i]->size; - reftable_writer_set_limits(wr, st->readers[first]->min_update_index, - st->readers[last]->max_update_index); + err = reftable_writer_set_limits(wr, st->readers[first]->min_update_index, + st->readers[last]->max_update_index); + if (err < 0) + goto done; err = reftable_merged_table_new(&mt, st->readers + first, subtabs_len, st->opts.hash_id); diff --git a/reftable/writer.c b/reftable/writer.c index 740c98038ea..76e24018172 100644 --- a/reftable/writer.c +++ b/reftable/writer.c @@ -179,11 +179,24 @@ int reftable_writer_new(struct reftable_writer **out, return 0; } -void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min, +int reftable_writer_set_limits(struct reftable_writer *w, uint64_t min, uint64_t max) { + /* + * Set the min/max update index limits for the reftable writer. + * This must be called before adding any records, since: + * - The 'next' field gets set after writing the first block. + * - The 'last_key' field updates with each new record (but resets + * after sections). + * Returns REFTABLE_API_ERROR if called after writing has begun. + */ + if (w->next || w->last_key.len) + return REFTABLE_API_ERROR; + w->min_update_index = min; w->max_update_index = max; + + return 0; } static void writer_release(struct reftable_writer *w) diff --git a/t/unit-tests/t-reftable-stack.c b/t/unit-tests/t-reftable-stack.c index aeec195b2b1..c3f0059c346 100644 --- a/t/unit-tests/t-reftable-stack.c +++ b/t/unit-tests/t-reftable-stack.c @@ -103,7 +103,8 @@ static void t_read_file(void) static int write_test_ref(struct reftable_writer *wr, void *arg) { struct reftable_ref_record *ref = arg; - reftable_writer_set_limits(wr, ref->update_index, ref->update_index); + check(!reftable_writer_set_limits(wr, ref->update_index, + ref->update_index)); return reftable_writer_add_ref(wr, ref); } @@ -143,7 +144,8 @@ static int write_test_log(struct reftable_writer *wr, void *arg) { struct write_log_arg *wla = arg; - reftable_writer_set_limits(wr, wla->update_index, wla->update_index); + check(!reftable_writer_set_limits(wr, wla->update_index, + wla->update_index)); return reftable_writer_add_log(wr, wla->log); } @@ -961,7 +963,7 @@ static void t_reflog_expire(void) static int write_nothing(struct reftable_writer *wr, void *arg UNUSED) { - reftable_writer_set_limits(wr, 1, 1); + check(!reftable_writer_set_limits(wr, 1, 1)); return 0; } @@ -1369,11 +1371,57 @@ static void t_reftable_stack_reload_with_missing_table(void) clear_dir(dir); } +static int write_limits_after_ref(struct reftable_writer *wr, void *arg) +{ + struct reftable_ref_record *ref = arg; + check(!reftable_writer_set_limits(wr, ref->update_index, ref->update_index)); + check(!reftable_writer_add_ref(wr, ref)); + return reftable_writer_set_limits(wr, ref->update_index, ref->update_index); +} + +static void t_reftable_invalid_limit_updates(void) +{ + struct reftable_ref_record ref = { + .refname = (char *) "HEAD", + .update_index = 1, + .value_type = REFTABLE_REF_SYMREF, + .value.symref = (char *) "master", + }; + struct reftable_write_options opts = { + .default_permissions = 0660, + }; + struct reftable_addition *add = NULL; + char *dir = get_tmp_dir(__LINE__); + struct reftable_stack *st = NULL; + int err; + + err = reftable_new_stack(&st, dir, &opts); + check(!err); + + reftable_addition_destroy(add); + + err = reftable_stack_new_addition(&add, st, 0); + check(!err); + + /* + * write_limits_after_ref also updates the update indexes after adding + * the record. This should cause an err to be returned, since the limits + * must be set at the start. + */ + err = reftable_addition_add(add, write_limits_after_ref, &ref); + check_int(err, ==, REFTABLE_API_ERROR); + + reftable_addition_destroy(add); + reftable_stack_destroy(st); + clear_dir(dir); +} + int cmd_main(int argc UNUSED, const char *argv[] UNUSED) { TEST(t_empty_add(), "empty addition to stack"); TEST(t_read_file(), "read_lines works"); TEST(t_reflog_expire(), "expire reflog entries"); + TEST(t_reftable_invalid_limit_updates(), "prevent limit updates after adding records"); TEST(t_reftable_stack_add(), "add multiple refs and logs to stack"); TEST(t_reftable_stack_add_one(), "add a single ref record to stack"); TEST(t_reftable_stack_add_performs_auto_compaction(), "addition to stack triggers auto-compaction"); -- GitLab From 6bba6f604ba1658ad9b6b1de6eab299fb9fb35de Mon Sep 17 00:00:00 2001 From: Julian Prein Date: Thu, 9 Jan 2025 13:25:42 +0000 Subject: [PATCH 025/165] config.txt: add trailer.* variables The trailer.* configuration variables are currently only described in git-interpret-trailers(1) but affect git-commit and git-tag as well. Move that section into its own config/trailer.txt file and also include it in git-config(1). Signed-off-by: Julian Prein Acked-by: Eric Sesterhenn Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 + Documentation/config/trailer.txt | 136 ++++++++++++++++++++++ Documentation/git-interpret-trailers.txt | 137 +---------------------- 3 files changed, 140 insertions(+), 135 deletions(-) create mode 100644 Documentation/config/trailer.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 8c0b3ed8075..1b86323ca3f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -540,6 +540,8 @@ include::config/tar.txt[] include::config/trace2.txt[] +include::config/trailer.txt[] + include::config/transfer.txt[] include::config/uploadarchive.txt[] diff --git a/Documentation/config/trailer.txt b/Documentation/config/trailer.txt new file mode 100644 index 00000000000..60bc221c88b --- /dev/null +++ b/Documentation/config/trailer.txt @@ -0,0 +1,136 @@ +trailer.separators:: + This option tells which characters are recognized as trailer + separators. By default only ':' is recognized as a trailer + separator, except that '=' is always accepted on the command + line for compatibility with other git commands. ++ +The first character given by this option will be the default character +used when another separator is not specified in the config for this +trailer. ++ +For example, if the value for this option is "%=$", then only lines +using the format '' with containing '%', '=' +or '$' and then spaces will be considered trailers. And '%' will be +the default separator used, so by default trailers will appear like: +'% ' (one percent sign and one space will appear between +the key and the value). + +trailer.where:: + This option tells where a new trailer will be added. ++ +This can be `end`, which is the default, `start`, `after` or `before`. ++ +If it is `end`, then each new trailer will appear at the end of the +existing trailers. ++ +If it is `start`, then each new trailer will appear at the start, +instead of the end, of the existing trailers. ++ +If it is `after`, then each new trailer will appear just after the +last trailer with the same . ++ +If it is `before`, then each new trailer will appear just before the +first trailer with the same . + +trailer.ifexists:: + This option makes it possible to choose what action will be + performed when there is already at least one trailer with the + same in the input. ++ +The valid values for this option are: `addIfDifferentNeighbor` (this +is the default), `addIfDifferent`, `add`, `replace` or `doNothing`. ++ +With `addIfDifferentNeighbor`, a new trailer will be added only if no +trailer with the same (, ) pair is above or below the line +where the new trailer will be added. ++ +With `addIfDifferent`, a new trailer will be added only if no trailer +with the same (, ) pair is already in the input. ++ +With `add`, a new trailer will be added, even if some trailers with +the same (, ) pair are already in the input. ++ +With `replace`, an existing trailer with the same will be +deleted and the new trailer will be added. The deleted trailer will be +the closest one (with the same ) to the place where the new one +will be added. ++ +With `doNothing`, nothing will be done; that is no new trailer will be +added if there is already one with the same in the input. + +trailer.ifmissing:: + This option makes it possible to choose what action will be + performed when there is not yet any trailer with the same + in the input. ++ +The valid values for this option are: `add` (this is the default) and +`doNothing`. ++ +With `add`, a new trailer will be added. ++ +With `doNothing`, nothing will be done. + +trailer..key:: + Defines a for the . The must be a + prefix (case does not matter) of the . For example, in `git + config trailer.ack.key "Acked-by"` the "Acked-by" is the and + the "ack" is the . This configuration allows the shorter + `--trailer "ack:..."` invocation on the command line using the "ack" + instead of the longer `--trailer "Acked-by:..."`. ++ +At the end of the , a separator can appear and then some +space characters. By default the only valid separator is ':', +but this can be changed using the `trailer.separators` config +variable. ++ +If there is a separator in the key, then it overrides the default +separator when adding the trailer. + +trailer..where:: + This option takes the same values as the 'trailer.where' + configuration variable and it overrides what is specified by + that option for trailers with the specified . + +trailer..ifexists:: + This option takes the same values as the 'trailer.ifexists' + configuration variable and it overrides what is specified by + that option for trailers with the specified . + +trailer..ifmissing:: + This option takes the same values as the 'trailer.ifmissing' + configuration variable and it overrides what is specified by + that option for trailers with the specified . + +trailer..command:: + Deprecated in favor of 'trailer..cmd'. + This option behaves in the same way as 'trailer..cmd', except + that it doesn't pass anything as argument to the specified command. + Instead the first occurrence of substring $ARG is replaced by the + that would be passed as argument. ++ +Note that $ARG in the user's command is +only replaced once and that the original way of replacing $ARG is not safe. ++ +When both 'trailer..cmd' and 'trailer..command' are given +for the same , 'trailer..cmd' is used and +'trailer..command' is ignored. + +trailer..cmd:: + This option can be used to specify a shell command that will be called + once to automatically add a trailer with the specified , and then + called each time a '--trailer =' argument is specified to + modify the of the trailer that this option would produce. ++ +When the specified command is first called to add a trailer +with the specified , the behavior is as if a special +'--trailer =' argument was added at the beginning +of the "git interpret-trailers" command, where +is taken to be the standard output of the command with any +leading and trailing whitespace trimmed off. ++ +If some '--trailer =' arguments are also passed +on the command line, the command is called again once for each +of these arguments with the same . And the part +of these arguments, if any, will be passed to the command as its +first argument. This way the command can produce a computed +from the passed in the '--trailer =' argument. diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index d9dfb75fef5..c9435d549ad 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -186,142 +186,9 @@ OPTIONS CONFIGURATION VARIABLES ----------------------- -trailer.separators:: - This option tells which characters are recognized as trailer - separators. By default only ':' is recognized as a trailer - separator, except that '=' is always accepted on the command - line for compatibility with other git commands. -+ -The first character given by this option will be the default character -used when another separator is not specified in the config for this -trailer. -+ -For example, if the value for this option is "%=$", then only lines -using the format '' with containing '%', '=' -or '$' and then spaces will be considered trailers. And '%' will be -the default separator used, so by default trailers will appear like: -'% ' (one percent sign and one space will appear between -the key and the value). - -trailer.where:: - This option tells where a new trailer will be added. -+ -This can be `end`, which is the default, `start`, `after` or `before`. -+ -If it is `end`, then each new trailer will appear at the end of the -existing trailers. -+ -If it is `start`, then each new trailer will appear at the start, -instead of the end, of the existing trailers. -+ -If it is `after`, then each new trailer will appear just after the -last trailer with the same . -+ -If it is `before`, then each new trailer will appear just before the -first trailer with the same . +include::includes/cmd-config-section-all.txt[] -trailer.ifexists:: - This option makes it possible to choose what action will be - performed when there is already at least one trailer with the - same in the input. -+ -The valid values for this option are: `addIfDifferentNeighbor` (this -is the default), `addIfDifferent`, `add`, `replace` or `doNothing`. -+ -With `addIfDifferentNeighbor`, a new trailer will be added only if no -trailer with the same (, ) pair is above or below the line -where the new trailer will be added. -+ -With `addIfDifferent`, a new trailer will be added only if no trailer -with the same (, ) pair is already in the input. -+ -With `add`, a new trailer will be added, even if some trailers with -the same (, ) pair are already in the input. -+ -With `replace`, an existing trailer with the same will be -deleted and the new trailer will be added. The deleted trailer will be -the closest one (with the same ) to the place where the new one -will be added. -+ -With `doNothing`, nothing will be done; that is no new trailer will be -added if there is already one with the same in the input. - -trailer.ifmissing:: - This option makes it possible to choose what action will be - performed when there is not yet any trailer with the same - in the input. -+ -The valid values for this option are: `add` (this is the default) and -`doNothing`. -+ -With `add`, a new trailer will be added. -+ -With `doNothing`, nothing will be done. - -trailer..key:: - Defines a for the . The must be a - prefix (case does not matter) of the . For example, in `git - config trailer.ack.key "Acked-by"` the "Acked-by" is the and - the "ack" is the . This configuration allows the shorter - `--trailer "ack:..."` invocation on the command line using the "ack" - instead of the longer `--trailer "Acked-by:..."`. -+ -At the end of the , a separator can appear and then some -space characters. By default the only valid separator is ':', -but this can be changed using the `trailer.separators` config -variable. -+ -If there is a separator in the key, then it overrides the default -separator when adding the trailer. - -trailer..where:: - This option takes the same values as the 'trailer.where' - configuration variable and it overrides what is specified by - that option for trailers with the specified . - -trailer..ifexists:: - This option takes the same values as the 'trailer.ifexists' - configuration variable and it overrides what is specified by - that option for trailers with the specified . - -trailer..ifmissing:: - This option takes the same values as the 'trailer.ifmissing' - configuration variable and it overrides what is specified by - that option for trailers with the specified . - -trailer..command:: - Deprecated in favor of 'trailer..cmd'. - This option behaves in the same way as 'trailer..cmd', except - that it doesn't pass anything as argument to the specified command. - Instead the first occurrence of substring $ARG is replaced by the - that would be passed as argument. -+ -Note that $ARG in the user's command is -only replaced once and that the original way of replacing $ARG is not safe. -+ -When both 'trailer..cmd' and 'trailer..command' are given -for the same , 'trailer..cmd' is used and -'trailer..command' is ignored. - -trailer..cmd:: - This option can be used to specify a shell command that will be called - once to automatically add a trailer with the specified , and then - called each time a '--trailer =' argument is specified to - modify the of the trailer that this option would produce. -+ -When the specified command is first called to add a trailer -with the specified , the behavior is as if a special -'--trailer =' argument was added at the beginning -of the "git interpret-trailers" command, where -is taken to be the standard output of the command with any -leading and trailing whitespace trimmed off. -+ -If some '--trailer =' arguments are also passed -on the command line, the command is called again once for each -of these arguments with the same . And the part -of these arguments, if any, will be passed to the command as its -first argument. This way the command can produce a computed -from the passed in the '--trailer =' argument. +include::config/trailer.txt[] EXAMPLES -------- -- GitLab From 08032fa30fefa3101bec4b774e79f4d091b516a6 Mon Sep 17 00:00:00 2001 From: ZheNing Hu Date: Fri, 24 Jan 2025 07:49:14 +0000 Subject: [PATCH 026/165] gc: add `--expire-to` option This commit extends the functionality of `git gc` by adding a new option, `--expire-to=`. Previously, this feature was implemented in 91badeba32 (builtin/repack.c: implement `--expire-to` for storing pruned objects, 2022-10-24), which allowing users to specify a directory where unreachable and expired cruft packs are stored during garbage collection. However, users had to run `git repack --cruft --expire-to=` followed by `git prune` to achieve similar results within `git gc`. By introducing `--expire-to=` directly into `git gc`, we simplify the process for users who wish to manage their repository's cleanup more efficiently. This change involves passing the `--expire-to=` parameter through to `git repack`, making it easier for users to set up a backup location for cruft packs that will be pruned. Due to the original `git gc --prune=now` deleting all unreachable objects by passing the `-a` parameter to git repack. With the addition of the `--cruft` and `--expire-to` options, it is necessary to modify this default behavior: instead of deleting these unreachable objects, they should be merged into a cruft pack and collected in a specified directory. Therefore, we do not pass `-a` to the repack command but instead pass `--cruft`, `--expire-to`, and `--cruft-expiration=now` to repack. Signed-off-by: ZheNing Hu Signed-off-by: Junio C Hamano --- Documentation/git-gc.txt | 7 +++++++ builtin/gc.c | 9 +++++++-- t/t6500-gc.sh | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 370e22faaeb..0eac8e85f08 100644 --- a/Documentation/git-gc.txt +++ b/Documentation/git-gc.txt @@ -69,6 +69,13 @@ be performed as well. the `--max-cruft-size` option of linkgit:git-repack[1] for more. +--expire-to=:: + When packing unreachable objects into a cruft pack, write a cruft + pack containing pruned objects (if any) to the directory ``. + This option only has an effect when used together with `--cruft`. + See the `--expire-to` option of linkgit:git-repack[1] for + more information. + --prune=:: Prune loose objects older than date (default is 2 weeks ago, overridable by the config variable `gc.pruneExpire`). diff --git a/builtin/gc.c b/builtin/gc.c index d52735354c9..8656e1caff0 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -136,6 +136,7 @@ struct gc_config { char *prune_worktrees_expire; char *repack_filter; char *repack_filter_to; + char *repack_expire_to; unsigned long big_pack_threshold; unsigned long max_delta_cache_size; }; @@ -432,7 +433,8 @@ static int keep_one_pack(struct string_list_item *item, void *data UNUSED) static void add_repack_all_option(struct gc_config *cfg, struct string_list *keep_pack) { - if (cfg->prune_expire && !strcmp(cfg->prune_expire, "now")) + if (cfg->prune_expire && !strcmp(cfg->prune_expire, "now") + && !(cfg->cruft_packs && cfg->repack_expire_to)) strvec_push(&repack, "-a"); else if (cfg->cruft_packs) { strvec_push(&repack, "--cruft"); @@ -441,6 +443,8 @@ static void add_repack_all_option(struct gc_config *cfg, if (cfg->max_cruft_size) strvec_pushf(&repack, "--max-cruft-size=%lu", cfg->max_cruft_size); + if (cfg->repack_expire_to) + strvec_pushf(&repack, "--expire-to=%s", cfg->repack_expire_to); } else { strvec_push(&repack, "-A"); if (cfg->prune_expire) @@ -675,7 +679,6 @@ struct repository *repo UNUSED) const char *prune_expire_sentinel = "sentinel"; const char *prune_expire_arg = prune_expire_sentinel; int ret; - struct option builtin_gc_options[] = { OPT__QUIET(&quiet, N_("suppress progress reporting")), { OPTION_STRING, 0, "prune", &prune_expire_arg, N_("date"), @@ -694,6 +697,8 @@ struct repository *repo UNUSED) PARSE_OPT_NOCOMPLETE), OPT_BOOL(0, "keep-largest-pack", &keep_largest_pack, N_("repack all other packs except the largest pack")), + OPT_STRING(0, "expire-to", &cfg.repack_expire_to, N_("dir"), + N_("pack prefix to store a pack containing pruned objects")), OPT_END() }; diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index ee074b99b70..74f7bd09046 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -339,6 +339,39 @@ test_expect_success 'gc.maxCruftSize sets appropriate repack options' ' test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 Date: Sat, 25 Jan 2025 23:57:36 +0000 Subject: [PATCH 027/165] bundle: avoid closing file descriptor twice Already when introduced in c7a8a16239 (Add bundle transport, 2007-09-10), the `bundle` transport had a bug where it would open a file descriptor to the bundle file and then close it _twice_: First, the file descriptor (`data->fd`) is passed to `unbundle()`, which would use it as the `stdin` of the `index-pack` process, which as a consequence would close it via `start_command()`. However, `data->fd` would still hold the numerical value of the file descriptor, and `close_bundle()` would see that and happily close it again. This seems not to have caused too many problems in almost two decades, but I encountered a situation today where it _does_ cause problems: In i686 variants of Git for Windows, it seems that file descriptors are reused quickly after they have been closed. In the particular scenario I faced, `git fetch ` gets the same file descriptor value when opening the bundle file and importing its embedded packfile (which implicitly closes the file descriptor) and then when opening a pack file in `fetch_and_consume_refs()` while looking up an object's header. Later on, after the bundle has been imported (and the `close_bundle()` function erroneously closes the file descriptor that has _already_ been closed when using it as `stdin` for `git index-pack`), the same file descriptor value has now been reused via `use_pack()`. Now, when either the recursive fetch (which defaults to "on", unfortunately) or a commit-graph update needs to `mmap()` the packfile, it fails due to a now-invalid file descriptor that _should_ point to the pack file but doesn't anymore. To fix that, let's invalidate `data->fd` after calling `unbundle()`. That way, `close_bundle()` does not close a file descriptor that may have been reused for something different. While at it, document that `unbundle()` closes the file descriptor, and ensure that it also does that when failing to verify the bundle. Luckily, this bug does not affect the bundle URI feature, it only affects the `git fetch ` code path. Note that this patch does not _completely_ clarifies who is responsible to close that file descriptor, as `run_command()` may fail _without_ closing `cmd->in`. Addressing this issue thoroughly, however, would require a rather thorough re-design of the `start_command()` and `finish_command()` functionality to make it a lot less murky who is responsible for what file descriptors. At least this here patch is relatively easy to reason about, and addresses a hard failure (`fatal: mmap: could not determine filesize`) at the expense of leaking a file descriptor under very rare circumstances in which `git fetch` would error out anyway. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- bundle.c | 4 +++- bundle.h | 2 ++ transport.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bundle.c b/bundle.c index f18f98fec9c..d7ad6908433 100644 --- a/bundle.c +++ b/bundle.c @@ -607,8 +607,10 @@ int unbundle(struct repository *r, struct bundle_header *header, if (!opts) opts = &opts_fallback; - if (verify_bundle(r, header, opts->flags)) + if (verify_bundle(r, header, opts->flags)) { + close(bundle_fd); return -1; + } strvec_pushl(&ip.args, "index-pack", "--fix-thin", "--stdin", NULL); diff --git a/bundle.h b/bundle.h index a80aa8ad9bf..d664b2f2d61 100644 --- a/bundle.h +++ b/bundle.h @@ -62,6 +62,8 @@ struct unbundle_opts { * * Before unbundling, this method will call verify_bundle() with 'flags' * provided in 'opts'. + * + * Note that the `bundle_fd` will be closed as part of the operation. */ int unbundle(struct repository *r, struct bundle_header *header, int bundle_fd, struct strvec *extra_index_pack_args, diff --git a/transport.c b/transport.c index 10d820c3335..eb808f1e4b7 100644 --- a/transport.c +++ b/transport.c @@ -207,6 +207,7 @@ static int fetch_refs_from_bundle(struct transport *transport, ret = unbundle(the_repository, &data->header, data->fd, &extra_index_pack_args, &opts); + data->fd = -1; /* `unbundle()` closes the file descriptor */ transport->hash_algo = data->header.hash_algo; strvec_clear(&extra_index_pack_args); -- GitLab From 638060dcb95ed7ef3b2f6e6038ac12744d8ba238 Mon Sep 17 00:00:00 2001 From: Bence Ferdinandy Date: Sun, 26 Jan 2025 23:02:10 +0100 Subject: [PATCH 028/165] fetch set_head: refactor to use remote directly As a preparatory step to use even more properties from the remote struct, refactor set_head to take the entire struct as a parameter, instead of the necessary bits. This also allows consolidating the use of gtransport->remote in set_head, making the access of the remote's properties consistent in the function. Signed-off-by: Bence Ferdinandy Signed-off-by: Junio C Hamano --- builtin/fetch.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index fe2b26c74ae..3167b055d12 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1617,13 +1617,13 @@ static void report_set_head(const char *remote, const char *head_name, strbuf_release(&buf_prefix); } -static int set_head(const struct ref *remote_refs, int follow_remote_head, - const char *no_warn_branch) +static int set_head(const struct ref *remote_refs, struct remote *remote) { int result = 0, create_only, is_bare, was_detached; struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT, b_local_head = STRBUF_INIT; - const char *remote = gtransport->remote->name; + int follow_remote_head = remote->follow_remote_head; + const char *no_warn_branch = remote->no_warn_branch; char *head_name = NULL; struct ref *ref, *matches; struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map; @@ -1661,8 +1661,8 @@ static int set_head(const struct ref *remote_refs, int follow_remote_head, strbuf_addstr(&b_head, "HEAD"); strbuf_addf(&b_remote_head, "refs/heads/%s", head_name); } else { - strbuf_addf(&b_head, "refs/remotes/%s/HEAD", remote); - strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", remote, head_name); + strbuf_addf(&b_head, "refs/remotes/%s/HEAD", remote->name); + strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", remote->name, head_name); } /* make sure it's valid */ if (!is_bare && !refs_ref_exists(refs, b_remote_head.buf)) { @@ -1678,7 +1678,7 @@ static int set_head(const struct ref *remote_refs, int follow_remote_head, if (verbosity >= 0 && follow_remote_head == FOLLOW_REMOTE_WARN && (!no_warn_branch || strcmp(no_warn_branch, head_name))) - report_set_head(remote, head_name, &b_local_head, was_detached); + report_set_head(remote->name, head_name, &b_local_head, was_detached); cleanup: free(head_name); @@ -1924,8 +1924,7 @@ static int do_fetch(struct transport *transport, "you need to specify exactly one branch with the --set-upstream option")); } } - if (set_head(remote_refs, transport->remote->follow_remote_head, - transport->remote->no_warn_branch)) + if (set_head(remote_refs, transport->remote)) ; /* * Way too many cases where this can go wrong -- GitLab From 93dc16483a312b77c0b6533a6c2705d1df3e3687 Mon Sep 17 00:00:00 2001 From: Bence Ferdinandy Date: Sun, 26 Jan 2025 23:02:11 +0100 Subject: [PATCH 029/165] fetch set_head: fix non-mirror remotes in bare repositories In b1b713f722 (fetch set_head: handle mirrored bare repositories, 2024-11-22) it was implicitly assumed that all remotes will be mirrors in a bare repository, thus fetching a non-mirrored remote could lead to HEAD pointing to a non-existent reference. Make sure we only overwrite HEAD if we are in a bare repository and fetching from a mirror. Otherwise, proceed as normally, and create refs/remotes//HEAD instead. Reported-by: Christian Hesse Signed-off-by: Bence Ferdinandy Signed-off-by: Junio C Hamano --- builtin/fetch.c | 10 +++++----- t/t5505-remote.sh | 10 ++++++++++ t/t5510-fetch.sh | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 3167b055d12..1c740d5aac3 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1619,7 +1619,7 @@ static void report_set_head(const char *remote, const char *head_name, static int set_head(const struct ref *remote_refs, struct remote *remote) { - int result = 0, create_only, is_bare, was_detached; + int result = 0, create_only, baremirror, was_detached; struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT, b_local_head = STRBUF_INIT; int follow_remote_head = remote->follow_remote_head; @@ -1655,9 +1655,9 @@ static int set_head(const struct ref *remote_refs, struct remote *remote) if (!head_name) goto cleanup; - is_bare = is_bare_repository(); - create_only = follow_remote_head == FOLLOW_REMOTE_ALWAYS ? 0 : !is_bare; - if (is_bare) { + baremirror = is_bare_repository() && remote->mirror; + create_only = follow_remote_head == FOLLOW_REMOTE_ALWAYS ? 0 : !baremirror; + if (baremirror) { strbuf_addstr(&b_head, "HEAD"); strbuf_addf(&b_remote_head, "refs/heads/%s", head_name); } else { @@ -1665,7 +1665,7 @@ static int set_head(const struct ref *remote_refs, struct remote *remote) strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", remote->name, head_name); } /* make sure it's valid */ - if (!is_bare && !refs_ref_exists(refs, b_remote_head.buf)) { + if (!baremirror && !refs_ref_exists(refs, b_remote_head.buf)) { result = 1; goto cleanup; } diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 519f7973e31..66e373f71db 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -589,6 +589,16 @@ test_expect_success 'add --mirror setting HEAD' ' ) ' +test_expect_success 'non-mirror fetch does not interfere with mirror' ' + test_when_finished rm -rf headnotmain && + ( + git init --bare -b notmain headnotmain && + cd headnotmain && + git remote add -f other ../two && + test "$(git symbolic-ref HEAD)" = "refs/heads/notmain" + ) +' + test_expect_success 'add --mirror=fetch' ' mkdir mirror-fetch && git init -b main mirror-fetch/parent && diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 2d9587059f5..c9d7b46c877 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -84,6 +84,23 @@ test_expect_success "fetch test remote HEAD" ' branch=$(git rev-parse refs/remotes/origin/main) && test "z$head" = "z$branch"' +test_expect_success "fetch test remote HEAD in bare repository" ' + test_when_finished rm -rf barerepo && + ( + cd "$D" && + git init --bare barerepo && + cd barerepo && + git remote add upstream ../two && + git fetch upstream && + git rev-parse --verify refs/remotes/upstream/HEAD && + git rev-parse --verify refs/remotes/upstream/main && + head=$(git rev-parse refs/remotes/upstream/HEAD) && + branch=$(git rev-parse refs/remotes/upstream/main) && + test "z$head" = "z$branch" + ) +' + + test_expect_success "fetch test remote HEAD change" ' cd "$D" && cd two && -- GitLab From dca924b4508e3147e82be5bba10cfc8aefa7ecf0 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Mon, 27 Jan 2025 19:02:28 +0000 Subject: [PATCH 030/165] pack-objects: create new name-hash function version As we will explore in later changes, the default name-hash function used in 'git pack-objects' has a tendency to cause collisions and cause poor delta selection. This change creates an alternative that avoids some collisions while preserving some amount of hash locality. The pack_name_hash() method has not been materially changed since it was introduced in ce0bd64 (pack-objects: improve path grouping heuristics., 2006-06-05). The intention here is to group objects by path name, but also attempt to group similar file types together by making the most-significant digits of the hash be focused on the final characters. Here's the crux of the implementation: /* * This effectively just creates a sortable number from the * last sixteen non-whitespace characters. Last characters * count "most", so things that end in ".c" sort together. */ while ((c = *name++) != 0) { if (isspace(c)) continue; hash = (hash >> 2) + (c << 24); } As the comment mentions, this only cares about the last sixteen non-whitespace characters. This cause some filenames to collide more than others. This collision is somewhat by design in order to promote hash locality for files that have similar types (.c, .h, .json) or could be the same file across a directory rename (a/foo.txt to b/foo.txt). This leads to decent cross-path deltas in cases like shallow clones or packing a repository with very few historical versions of files that share common data with other similarly-named files. However, when the name-hash instead leads to a large number of name-hash collisions for otherwise unrelated files, this can lead to confusing the delta calculation to prefer cross-path deltas over previous versions of the same file. The new pack_name_hash_v2() function attempts to fix this issue by taking more of the directory path into account through its hash function. Its naming implies that we will later wire up details for choosing a name-hash function by version. The first change is to be more careful about paths using non-ASCII characters. With these characters in mind, reverse the bits in the byte as the least-significant bits have the highest entropy and we want to maximize their influence. This is done with some bit manipulation that swaps the two halves, then the quarters within those halves, and then the bits within those quarters. The second change is to perform hash composition operations at every level of the path. This is done by storing a 'base' hash value that contains the hash of the parent directory. When reaching a directory boundary, we XOR the current level's name-hash value with a downshift of the previous level's hash. This perturbation intends to create low-bit distinctions for paths with the same final 16 bytes but distinct parent directory structures. The collision rate and effectiveness of this hash function will be explored in later changes as the function is integrated with 'git pack-objects' and 'git repack'. Signed-off-by: Jonathan Tan Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- pack-objects.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pack-objects.h b/pack-objects.h index b9898a4e64b..681c1116486 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -207,6 +207,34 @@ static inline uint32_t pack_name_hash(const char *name) return hash; } +static inline uint32_t pack_name_hash_v2(const unsigned char *name) +{ + uint32_t hash = 0, base = 0, c; + + if (!name) + return 0; + + while ((c = *name++)) { + if (isspace(c)) + continue; + if (c == '/') { + base = (base >> 6) ^ hash; + hash = 0; + } else { + /* + * 'c' is only a single byte. Reverse it and move + * it to the top of the hash, moving the rest to + * less-significant bits. + */ + c = (c & 0xF0) >> 4 | (c & 0x0F) << 4; + c = (c & 0xCC) >> 2 | (c & 0x33) << 2; + c = (c & 0xAA) >> 1 | (c & 0x55) << 1; + hash = (hash >> 2) + (c << 24); + } + } + return (base >> 6) ^ hash; +} + static inline enum object_type oe_type(const struct object_entry *e) { return e->type_valid ? e->type_ : OBJ_BAD; -- GitLab From fc62e033cd93ff6b93e312d89bfb5683a4c6f90c Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 27 Jan 2025 19:02:29 +0000 Subject: [PATCH 031/165] pack-objects: add --name-hash-version option The previous change introduced a new pack_name_hash_v2() function that intends to satisfy much of the hash locality features of the existing pack_name_hash() function while also distinguishing paths with similar final components of their paths. This change adds a new --name-hash-version option for 'git pack-objects' to allow users to select their preferred function version. This use of an integer version allows for future expansion and a direct way to later store a name hash version in the .bitmap format. For now, let's consider how effective this mechanism is when repacking a repository with different name hash versions. Specifically, we will execute 'git pack-objects' the same way a 'git repack -adf' process would, except we include --name-hash-version= for testing. On the Git repository, we do not expect much difference. All path names are short. This is backed by our results: | Stage | Pack Size | Repack Time | |-----------------------|-----------|-------------| | After clone | 260 MB | N/A | | --name-hash-version=1 | 127 MB | 129s | | --name-hash-version=2 | 127 MB | 112s | This example demonstrates how there is some natural overhead coming from the cloned copy because the server is hosting many forks and has not optimized for exactly this set of reachable objects. But the full repack has similar characteristics for both versions. Let's consider some repositories that are hitting too many collisions with version 1. First, let's explore the kinds of paths that are commonly causing these collisions: * "/CHANGELOG.json" is 15 characters, and is created by the beachball [1] tool. Only the final character of the parent directory can differentiate different versions of this file, but also only the two most-significant digits. If that character is a letter, then this is always a collision. Similar issues occur with the similar "/CHANGELOG.md" path, though there is more opportunity for differences In the parent directory. * Localization files frequently have common filenames but differentiates via parent directories. In C#, the name "/strings.resx.lcl" is used for these localization files and they will all collide in name-hash. [1] https://github.com/microsoft/beachball I've come across many other examples where some internal tool uses a common name across multiple directories and is causing Git to repack poorly due to name-hash collisions. One open-source example is the fluentui [2] repo, which uses beachball to generate CHANGELOG.json and CHANGELOG.md files, and these files have very poor delta characteristics when comparing against versions across parent directories. | Stage | Pack Size | Repack Time | |-----------------------|-----------|-------------| | After clone | 694 MB | N/A | | --name-hash-version=1 | 438 MB | 728s | | --name-hash-version=2 | 168 MB | 142s | [2] https://github.com/microsoft/fluentui In this example, we see significant gains in the compressed packfile size as well as the time taken to compute the packfile. Using a collection of repositories that use the beachball tool, I was able to make similar comparisions with dramatic results. While the fluentui repo is public, the others are private so cannot be shared for reproduction. The results are so significant that I find it important to share here: | Repo | --name-hash-version=1 | --name-hash-version=2 | |----------|-----------------------|-----------------------| | fluentui | 440 MB | 161 MB | | Repo B | 6,248 MB | 856 MB | | Repo C | 37,278 MB | 6,755 MB | | Repo D | 131,204 MB | 7,463 MB | Future changes could include making --name-hash-version implied by a config value or even implied by default during a full repack. It is important to point out that the name hash value is stored in the .bitmap file format, so we must force --name-hash-version=1 when bitmaps are being read or written. Later, the bitmap format could be updated to be aware of the name hash version so deltas can be quickly computed across the bitmapped/not-bitmapped boundary. To promote the safety of this parameter, the validate_name_hash_version() method will die() if the given name-hash version is incorrect and will disable newer versions if not yet compatible with other features, such as --write-bitmap-index. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- Documentation/git-pack-objects.txt | 32 +++++++++++++++++- builtin/pack-objects.c | 52 +++++++++++++++++++++++++++--- t/t5300-pack-object.sh | 31 ++++++++++++++++++ 3 files changed, 109 insertions(+), 6 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index e32404c6aae..7f69ae4855f 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -15,7 +15,8 @@ SYNOPSIS [--revs [--unpacked | --all]] [--keep-pack=] [--cruft] [--cruft-expiration=