From 85a0ca66e0eb2185e62a6e3b03bcbfa1b41f0c2e Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Wed, 19 Feb 2020 17:00:35 -0800 Subject: [PATCH] We no longer have two doc systems, move sphinx_doc_src back to doc_src --- .gitattributes | 4 ++-- cmake/Docs.cmake | 4 ++-- {sphinx_doc_src => doc_src}/_static/custom.css | 0 {sphinx_doc_src => doc_src}/_static/pygments.css | 0 {sphinx_doc_src => doc_src}/cmds/abbr.rst | 0 {sphinx_doc_src => doc_src}/cmds/alias.rst | 0 {sphinx_doc_src => doc_src}/cmds/and.rst | 0 {sphinx_doc_src => doc_src}/cmds/argparse.rst | 0 {sphinx_doc_src => doc_src}/cmds/begin.rst | 0 {sphinx_doc_src => doc_src}/cmds/bg.rst | 0 {sphinx_doc_src => doc_src}/cmds/bind.rst | 0 {sphinx_doc_src => doc_src}/cmds/block.rst | 0 {sphinx_doc_src => doc_src}/cmds/break.rst | 0 {sphinx_doc_src => doc_src}/cmds/breakpoint.rst | 0 {sphinx_doc_src => doc_src}/cmds/builtin.rst | 0 {sphinx_doc_src => doc_src}/cmds/case.rst | 0 {sphinx_doc_src => doc_src}/cmds/cd.rst | 0 {sphinx_doc_src => doc_src}/cmds/cdh.rst | 0 {sphinx_doc_src => doc_src}/cmds/command.rst | 0 {sphinx_doc_src => doc_src}/cmds/commandline.rst | 0 {sphinx_doc_src => doc_src}/cmds/complete.rst | 0 {sphinx_doc_src => doc_src}/cmds/contains.rst | 0 {sphinx_doc_src => doc_src}/cmds/continue.rst | 0 {sphinx_doc_src => doc_src}/cmds/count.rst | 0 {sphinx_doc_src => doc_src}/cmds/dirh.rst | 0 {sphinx_doc_src => doc_src}/cmds/dirs.rst | 0 {sphinx_doc_src => doc_src}/cmds/disown.rst | 0 {sphinx_doc_src => doc_src}/cmds/echo.rst | 0 {sphinx_doc_src => doc_src}/cmds/else.rst | 0 {sphinx_doc_src => doc_src}/cmds/emit.rst | 0 {sphinx_doc_src => doc_src}/cmds/end.rst | 0 {sphinx_doc_src => doc_src}/cmds/eval.rst | 0 {sphinx_doc_src => doc_src}/cmds/exec.rst | 0 {sphinx_doc_src => doc_src}/cmds/exit.rst | 0 {sphinx_doc_src => doc_src}/cmds/false.rst | 0 {sphinx_doc_src => doc_src}/cmds/fg.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_breakpoint_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_config.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_git_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_hg_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_indent.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_key_reader.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_mode_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_opt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_right_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_svn_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_update_completions.rst | 0 {sphinx_doc_src => doc_src}/cmds/fish_vcs_prompt.rst | 0 {sphinx_doc_src => doc_src}/cmds/for.rst | 0 {sphinx_doc_src => doc_src}/cmds/funced.rst | 0 {sphinx_doc_src => doc_src}/cmds/funcsave.rst | 0 {sphinx_doc_src => doc_src}/cmds/function.rst | 0 {sphinx_doc_src => doc_src}/cmds/functions.rst | 0 {sphinx_doc_src => doc_src}/cmds/help.rst | 0 {sphinx_doc_src => doc_src}/cmds/history.rst | 0 {sphinx_doc_src => doc_src}/cmds/if.rst | 0 {sphinx_doc_src => doc_src}/cmds/isatty.rst | 0 {sphinx_doc_src => doc_src}/cmds/jobs.rst | 0 {sphinx_doc_src => doc_src}/cmds/math.rst | 0 {sphinx_doc_src => doc_src}/cmds/nextd.rst | 0 {sphinx_doc_src => doc_src}/cmds/not.rst | 0 {sphinx_doc_src => doc_src}/cmds/open.rst | 0 {sphinx_doc_src => doc_src}/cmds/or.rst | 0 {sphinx_doc_src => doc_src}/cmds/popd.rst | 0 {sphinx_doc_src => doc_src}/cmds/prevd.rst | 0 {sphinx_doc_src => doc_src}/cmds/printf.rst | 0 {sphinx_doc_src => doc_src}/cmds/prompt_pwd.rst | 0 {sphinx_doc_src => doc_src}/cmds/psub.rst | 0 {sphinx_doc_src => doc_src}/cmds/pushd.rst | 0 {sphinx_doc_src => doc_src}/cmds/pwd.rst | 0 {sphinx_doc_src => doc_src}/cmds/random.rst | 0 {sphinx_doc_src => doc_src}/cmds/read.rst | 0 {sphinx_doc_src => doc_src}/cmds/realpath.rst | 0 {sphinx_doc_src => doc_src}/cmds/return.rst | 0 {sphinx_doc_src => doc_src}/cmds/set.rst | 0 {sphinx_doc_src => doc_src}/cmds/set_color.rst | 0 {sphinx_doc_src => doc_src}/cmds/source.rst | 0 {sphinx_doc_src => doc_src}/cmds/status.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-collect.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-escape.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-join.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-join0.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-length.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-lower.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-match.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-repeat.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-replace.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-split.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-split0.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-sub.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-trim.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-unescape.rst | 0 {sphinx_doc_src => doc_src}/cmds/string-upper.rst | 0 {sphinx_doc_src => doc_src}/cmds/string.rst | 0 {sphinx_doc_src => doc_src}/cmds/suspend.rst | 0 {sphinx_doc_src => doc_src}/cmds/switch.rst | 0 {sphinx_doc_src => doc_src}/cmds/test.rst | 0 {sphinx_doc_src => doc_src}/cmds/time.rst | 0 {sphinx_doc_src => doc_src}/cmds/trap.rst | 0 {sphinx_doc_src => doc_src}/cmds/true.rst | 0 {sphinx_doc_src => doc_src}/cmds/type.rst | 0 {sphinx_doc_src => doc_src}/cmds/ulimit.rst | 0 {sphinx_doc_src => doc_src}/cmds/umask.rst | 0 {sphinx_doc_src => doc_src}/cmds/vared.rst | 0 {sphinx_doc_src => doc_src}/cmds/wait.rst | 0 {sphinx_doc_src => doc_src}/cmds/while.rst | 0 {sphinx_doc_src => doc_src}/commands.rst | 0 {sphinx_doc_src => doc_src}/conf.py | 0 {sphinx_doc_src => doc_src}/design.rst | 0 {sphinx_doc_src => doc_src}/faq.rst | 0 {sphinx_doc_src => doc_src}/fish_indent_lexer.py | 0 {sphinx_doc_src => doc_src}/index.rst | 0 {sphinx_doc_src => doc_src}/license.rst | 0 {sphinx_doc_src => doc_src}/tutorial.rst | 0 src/builtin.cpp | 4 ++-- 117 files changed, 6 insertions(+), 6 deletions(-) rename {sphinx_doc_src => doc_src}/_static/custom.css (100%) rename {sphinx_doc_src => doc_src}/_static/pygments.css (100%) rename {sphinx_doc_src => doc_src}/cmds/abbr.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/alias.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/and.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/argparse.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/begin.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/bg.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/bind.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/block.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/break.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/breakpoint.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/builtin.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/case.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/cd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/cdh.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/command.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/commandline.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/complete.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/contains.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/continue.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/count.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/dirh.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/dirs.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/disown.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/echo.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/else.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/emit.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/end.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/eval.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/exec.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/exit.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/false.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fg.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_breakpoint_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_config.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_git_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_hg_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_indent.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_key_reader.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_mode_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_opt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_right_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_svn_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_update_completions.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/fish_vcs_prompt.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/for.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/funced.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/funcsave.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/function.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/functions.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/help.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/history.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/if.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/isatty.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/jobs.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/math.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/nextd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/not.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/open.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/or.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/popd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/prevd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/printf.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/prompt_pwd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/psub.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/pushd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/pwd.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/random.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/read.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/realpath.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/return.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/set.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/set_color.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/source.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/status.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-collect.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-escape.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-join.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-join0.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-length.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-lower.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-match.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-repeat.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-replace.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-split.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-split0.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-sub.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-trim.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-unescape.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string-upper.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/string.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/suspend.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/switch.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/test.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/time.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/trap.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/true.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/type.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/ulimit.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/umask.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/vared.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/wait.rst (100%) rename {sphinx_doc_src => doc_src}/cmds/while.rst (100%) rename {sphinx_doc_src => doc_src}/commands.rst (100%) rename {sphinx_doc_src => doc_src}/conf.py (100%) rename {sphinx_doc_src => doc_src}/design.rst (100%) rename {sphinx_doc_src => doc_src}/faq.rst (100%) rename {sphinx_doc_src => doc_src}/fish_indent_lexer.py (100%) rename {sphinx_doc_src => doc_src}/index.rst (100%) rename {sphinx_doc_src => doc_src}/license.rst (100%) rename {sphinx_doc_src => doc_src}/tutorial.rst (100%) diff --git a/.gitattributes b/.gitattributes index e12e536be..b7d633295 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,6 +26,6 @@ # for linguist; let github identify our project as C++ instead of C due to pcre2 /pcre2/* linguist-vendored angular.js linguist-vendored -/sphinx_doc_src/* linguist-documentation +/doc_src/* linguist-documentation *.fish linguist-language=fish -tests/*.in linguist-language=fish +/tests/*.in linguist-language=fish diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake index eedb757e0..4d0045868 100644 --- a/cmake/Docs.cmake +++ b/cmake/Docs.cmake @@ -6,7 +6,7 @@ FIND_PROGRAM(SPHINX_EXECUTABLE NAMES sphinx-build INCLUDE(FeatureSummary) -SET(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sphinx_doc_src") +SET(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc_src") SET(SPHINX_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/user_doc") SET(SPHINX_BUILD_DIR "${SPHINX_ROOT_DIR}/build") SET(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees") @@ -26,7 +26,7 @@ ADD_CUSTOM_TARGET(sphinx-docs -d "${SPHINX_CACHE_DIR}" "${SPHINX_SRC_DIR}" "${SPHINX_HTML_DIR}" - DEPENDS sphinx_doc_src/fish_indent_lexer.py fish_indent + DEPENDS ${SPHINX_SRC_DIR}/fish_indent_lexer.py fish_indent COMMENT "Building HTML documentation with Sphinx") # sphinx-manpages needs the fish_indent binary for the version number diff --git a/sphinx_doc_src/_static/custom.css b/doc_src/_static/custom.css similarity index 100% rename from sphinx_doc_src/_static/custom.css rename to doc_src/_static/custom.css diff --git a/sphinx_doc_src/_static/pygments.css b/doc_src/_static/pygments.css similarity index 100% rename from sphinx_doc_src/_static/pygments.css rename to doc_src/_static/pygments.css diff --git a/sphinx_doc_src/cmds/abbr.rst b/doc_src/cmds/abbr.rst similarity index 100% rename from sphinx_doc_src/cmds/abbr.rst rename to doc_src/cmds/abbr.rst diff --git a/sphinx_doc_src/cmds/alias.rst b/doc_src/cmds/alias.rst similarity index 100% rename from sphinx_doc_src/cmds/alias.rst rename to doc_src/cmds/alias.rst diff --git a/sphinx_doc_src/cmds/and.rst b/doc_src/cmds/and.rst similarity index 100% rename from sphinx_doc_src/cmds/and.rst rename to doc_src/cmds/and.rst diff --git a/sphinx_doc_src/cmds/argparse.rst b/doc_src/cmds/argparse.rst similarity index 100% rename from sphinx_doc_src/cmds/argparse.rst rename to doc_src/cmds/argparse.rst diff --git a/sphinx_doc_src/cmds/begin.rst b/doc_src/cmds/begin.rst similarity index 100% rename from sphinx_doc_src/cmds/begin.rst rename to doc_src/cmds/begin.rst diff --git a/sphinx_doc_src/cmds/bg.rst b/doc_src/cmds/bg.rst similarity index 100% rename from sphinx_doc_src/cmds/bg.rst rename to doc_src/cmds/bg.rst diff --git a/sphinx_doc_src/cmds/bind.rst b/doc_src/cmds/bind.rst similarity index 100% rename from sphinx_doc_src/cmds/bind.rst rename to doc_src/cmds/bind.rst diff --git a/sphinx_doc_src/cmds/block.rst b/doc_src/cmds/block.rst similarity index 100% rename from sphinx_doc_src/cmds/block.rst rename to doc_src/cmds/block.rst diff --git a/sphinx_doc_src/cmds/break.rst b/doc_src/cmds/break.rst similarity index 100% rename from sphinx_doc_src/cmds/break.rst rename to doc_src/cmds/break.rst diff --git a/sphinx_doc_src/cmds/breakpoint.rst b/doc_src/cmds/breakpoint.rst similarity index 100% rename from sphinx_doc_src/cmds/breakpoint.rst rename to doc_src/cmds/breakpoint.rst diff --git a/sphinx_doc_src/cmds/builtin.rst b/doc_src/cmds/builtin.rst similarity index 100% rename from sphinx_doc_src/cmds/builtin.rst rename to doc_src/cmds/builtin.rst diff --git a/sphinx_doc_src/cmds/case.rst b/doc_src/cmds/case.rst similarity index 100% rename from sphinx_doc_src/cmds/case.rst rename to doc_src/cmds/case.rst diff --git a/sphinx_doc_src/cmds/cd.rst b/doc_src/cmds/cd.rst similarity index 100% rename from sphinx_doc_src/cmds/cd.rst rename to doc_src/cmds/cd.rst diff --git a/sphinx_doc_src/cmds/cdh.rst b/doc_src/cmds/cdh.rst similarity index 100% rename from sphinx_doc_src/cmds/cdh.rst rename to doc_src/cmds/cdh.rst diff --git a/sphinx_doc_src/cmds/command.rst b/doc_src/cmds/command.rst similarity index 100% rename from sphinx_doc_src/cmds/command.rst rename to doc_src/cmds/command.rst diff --git a/sphinx_doc_src/cmds/commandline.rst b/doc_src/cmds/commandline.rst similarity index 100% rename from sphinx_doc_src/cmds/commandline.rst rename to doc_src/cmds/commandline.rst diff --git a/sphinx_doc_src/cmds/complete.rst b/doc_src/cmds/complete.rst similarity index 100% rename from sphinx_doc_src/cmds/complete.rst rename to doc_src/cmds/complete.rst diff --git a/sphinx_doc_src/cmds/contains.rst b/doc_src/cmds/contains.rst similarity index 100% rename from sphinx_doc_src/cmds/contains.rst rename to doc_src/cmds/contains.rst diff --git a/sphinx_doc_src/cmds/continue.rst b/doc_src/cmds/continue.rst similarity index 100% rename from sphinx_doc_src/cmds/continue.rst rename to doc_src/cmds/continue.rst diff --git a/sphinx_doc_src/cmds/count.rst b/doc_src/cmds/count.rst similarity index 100% rename from sphinx_doc_src/cmds/count.rst rename to doc_src/cmds/count.rst diff --git a/sphinx_doc_src/cmds/dirh.rst b/doc_src/cmds/dirh.rst similarity index 100% rename from sphinx_doc_src/cmds/dirh.rst rename to doc_src/cmds/dirh.rst diff --git a/sphinx_doc_src/cmds/dirs.rst b/doc_src/cmds/dirs.rst similarity index 100% rename from sphinx_doc_src/cmds/dirs.rst rename to doc_src/cmds/dirs.rst diff --git a/sphinx_doc_src/cmds/disown.rst b/doc_src/cmds/disown.rst similarity index 100% rename from sphinx_doc_src/cmds/disown.rst rename to doc_src/cmds/disown.rst diff --git a/sphinx_doc_src/cmds/echo.rst b/doc_src/cmds/echo.rst similarity index 100% rename from sphinx_doc_src/cmds/echo.rst rename to doc_src/cmds/echo.rst diff --git a/sphinx_doc_src/cmds/else.rst b/doc_src/cmds/else.rst similarity index 100% rename from sphinx_doc_src/cmds/else.rst rename to doc_src/cmds/else.rst diff --git a/sphinx_doc_src/cmds/emit.rst b/doc_src/cmds/emit.rst similarity index 100% rename from sphinx_doc_src/cmds/emit.rst rename to doc_src/cmds/emit.rst diff --git a/sphinx_doc_src/cmds/end.rst b/doc_src/cmds/end.rst similarity index 100% rename from sphinx_doc_src/cmds/end.rst rename to doc_src/cmds/end.rst diff --git a/sphinx_doc_src/cmds/eval.rst b/doc_src/cmds/eval.rst similarity index 100% rename from sphinx_doc_src/cmds/eval.rst rename to doc_src/cmds/eval.rst diff --git a/sphinx_doc_src/cmds/exec.rst b/doc_src/cmds/exec.rst similarity index 100% rename from sphinx_doc_src/cmds/exec.rst rename to doc_src/cmds/exec.rst diff --git a/sphinx_doc_src/cmds/exit.rst b/doc_src/cmds/exit.rst similarity index 100% rename from sphinx_doc_src/cmds/exit.rst rename to doc_src/cmds/exit.rst diff --git a/sphinx_doc_src/cmds/false.rst b/doc_src/cmds/false.rst similarity index 100% rename from sphinx_doc_src/cmds/false.rst rename to doc_src/cmds/false.rst diff --git a/sphinx_doc_src/cmds/fg.rst b/doc_src/cmds/fg.rst similarity index 100% rename from sphinx_doc_src/cmds/fg.rst rename to doc_src/cmds/fg.rst diff --git a/sphinx_doc_src/cmds/fish.rst b/doc_src/cmds/fish.rst similarity index 100% rename from sphinx_doc_src/cmds/fish.rst rename to doc_src/cmds/fish.rst diff --git a/sphinx_doc_src/cmds/fish_breakpoint_prompt.rst b/doc_src/cmds/fish_breakpoint_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_breakpoint_prompt.rst rename to doc_src/cmds/fish_breakpoint_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_config.rst b/doc_src/cmds/fish_config.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_config.rst rename to doc_src/cmds/fish_config.rst diff --git a/sphinx_doc_src/cmds/fish_git_prompt.rst b/doc_src/cmds/fish_git_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_git_prompt.rst rename to doc_src/cmds/fish_git_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_hg_prompt.rst b/doc_src/cmds/fish_hg_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_hg_prompt.rst rename to doc_src/cmds/fish_hg_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_indent.rst b/doc_src/cmds/fish_indent.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_indent.rst rename to doc_src/cmds/fish_indent.rst diff --git a/sphinx_doc_src/cmds/fish_key_reader.rst b/doc_src/cmds/fish_key_reader.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_key_reader.rst rename to doc_src/cmds/fish_key_reader.rst diff --git a/sphinx_doc_src/cmds/fish_mode_prompt.rst b/doc_src/cmds/fish_mode_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_mode_prompt.rst rename to doc_src/cmds/fish_mode_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_opt.rst b/doc_src/cmds/fish_opt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_opt.rst rename to doc_src/cmds/fish_opt.rst diff --git a/sphinx_doc_src/cmds/fish_prompt.rst b/doc_src/cmds/fish_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_prompt.rst rename to doc_src/cmds/fish_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_right_prompt.rst b/doc_src/cmds/fish_right_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_right_prompt.rst rename to doc_src/cmds/fish_right_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_svn_prompt.rst b/doc_src/cmds/fish_svn_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_svn_prompt.rst rename to doc_src/cmds/fish_svn_prompt.rst diff --git a/sphinx_doc_src/cmds/fish_update_completions.rst b/doc_src/cmds/fish_update_completions.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_update_completions.rst rename to doc_src/cmds/fish_update_completions.rst diff --git a/sphinx_doc_src/cmds/fish_vcs_prompt.rst b/doc_src/cmds/fish_vcs_prompt.rst similarity index 100% rename from sphinx_doc_src/cmds/fish_vcs_prompt.rst rename to doc_src/cmds/fish_vcs_prompt.rst diff --git a/sphinx_doc_src/cmds/for.rst b/doc_src/cmds/for.rst similarity index 100% rename from sphinx_doc_src/cmds/for.rst rename to doc_src/cmds/for.rst diff --git a/sphinx_doc_src/cmds/funced.rst b/doc_src/cmds/funced.rst similarity index 100% rename from sphinx_doc_src/cmds/funced.rst rename to doc_src/cmds/funced.rst diff --git a/sphinx_doc_src/cmds/funcsave.rst b/doc_src/cmds/funcsave.rst similarity index 100% rename from sphinx_doc_src/cmds/funcsave.rst rename to doc_src/cmds/funcsave.rst diff --git a/sphinx_doc_src/cmds/function.rst b/doc_src/cmds/function.rst similarity index 100% rename from sphinx_doc_src/cmds/function.rst rename to doc_src/cmds/function.rst diff --git a/sphinx_doc_src/cmds/functions.rst b/doc_src/cmds/functions.rst similarity index 100% rename from sphinx_doc_src/cmds/functions.rst rename to doc_src/cmds/functions.rst diff --git a/sphinx_doc_src/cmds/help.rst b/doc_src/cmds/help.rst similarity index 100% rename from sphinx_doc_src/cmds/help.rst rename to doc_src/cmds/help.rst diff --git a/sphinx_doc_src/cmds/history.rst b/doc_src/cmds/history.rst similarity index 100% rename from sphinx_doc_src/cmds/history.rst rename to doc_src/cmds/history.rst diff --git a/sphinx_doc_src/cmds/if.rst b/doc_src/cmds/if.rst similarity index 100% rename from sphinx_doc_src/cmds/if.rst rename to doc_src/cmds/if.rst diff --git a/sphinx_doc_src/cmds/isatty.rst b/doc_src/cmds/isatty.rst similarity index 100% rename from sphinx_doc_src/cmds/isatty.rst rename to doc_src/cmds/isatty.rst diff --git a/sphinx_doc_src/cmds/jobs.rst b/doc_src/cmds/jobs.rst similarity index 100% rename from sphinx_doc_src/cmds/jobs.rst rename to doc_src/cmds/jobs.rst diff --git a/sphinx_doc_src/cmds/math.rst b/doc_src/cmds/math.rst similarity index 100% rename from sphinx_doc_src/cmds/math.rst rename to doc_src/cmds/math.rst diff --git a/sphinx_doc_src/cmds/nextd.rst b/doc_src/cmds/nextd.rst similarity index 100% rename from sphinx_doc_src/cmds/nextd.rst rename to doc_src/cmds/nextd.rst diff --git a/sphinx_doc_src/cmds/not.rst b/doc_src/cmds/not.rst similarity index 100% rename from sphinx_doc_src/cmds/not.rst rename to doc_src/cmds/not.rst diff --git a/sphinx_doc_src/cmds/open.rst b/doc_src/cmds/open.rst similarity index 100% rename from sphinx_doc_src/cmds/open.rst rename to doc_src/cmds/open.rst diff --git a/sphinx_doc_src/cmds/or.rst b/doc_src/cmds/or.rst similarity index 100% rename from sphinx_doc_src/cmds/or.rst rename to doc_src/cmds/or.rst diff --git a/sphinx_doc_src/cmds/popd.rst b/doc_src/cmds/popd.rst similarity index 100% rename from sphinx_doc_src/cmds/popd.rst rename to doc_src/cmds/popd.rst diff --git a/sphinx_doc_src/cmds/prevd.rst b/doc_src/cmds/prevd.rst similarity index 100% rename from sphinx_doc_src/cmds/prevd.rst rename to doc_src/cmds/prevd.rst diff --git a/sphinx_doc_src/cmds/printf.rst b/doc_src/cmds/printf.rst similarity index 100% rename from sphinx_doc_src/cmds/printf.rst rename to doc_src/cmds/printf.rst diff --git a/sphinx_doc_src/cmds/prompt_pwd.rst b/doc_src/cmds/prompt_pwd.rst similarity index 100% rename from sphinx_doc_src/cmds/prompt_pwd.rst rename to doc_src/cmds/prompt_pwd.rst diff --git a/sphinx_doc_src/cmds/psub.rst b/doc_src/cmds/psub.rst similarity index 100% rename from sphinx_doc_src/cmds/psub.rst rename to doc_src/cmds/psub.rst diff --git a/sphinx_doc_src/cmds/pushd.rst b/doc_src/cmds/pushd.rst similarity index 100% rename from sphinx_doc_src/cmds/pushd.rst rename to doc_src/cmds/pushd.rst diff --git a/sphinx_doc_src/cmds/pwd.rst b/doc_src/cmds/pwd.rst similarity index 100% rename from sphinx_doc_src/cmds/pwd.rst rename to doc_src/cmds/pwd.rst diff --git a/sphinx_doc_src/cmds/random.rst b/doc_src/cmds/random.rst similarity index 100% rename from sphinx_doc_src/cmds/random.rst rename to doc_src/cmds/random.rst diff --git a/sphinx_doc_src/cmds/read.rst b/doc_src/cmds/read.rst similarity index 100% rename from sphinx_doc_src/cmds/read.rst rename to doc_src/cmds/read.rst diff --git a/sphinx_doc_src/cmds/realpath.rst b/doc_src/cmds/realpath.rst similarity index 100% rename from sphinx_doc_src/cmds/realpath.rst rename to doc_src/cmds/realpath.rst diff --git a/sphinx_doc_src/cmds/return.rst b/doc_src/cmds/return.rst similarity index 100% rename from sphinx_doc_src/cmds/return.rst rename to doc_src/cmds/return.rst diff --git a/sphinx_doc_src/cmds/set.rst b/doc_src/cmds/set.rst similarity index 100% rename from sphinx_doc_src/cmds/set.rst rename to doc_src/cmds/set.rst diff --git a/sphinx_doc_src/cmds/set_color.rst b/doc_src/cmds/set_color.rst similarity index 100% rename from sphinx_doc_src/cmds/set_color.rst rename to doc_src/cmds/set_color.rst diff --git a/sphinx_doc_src/cmds/source.rst b/doc_src/cmds/source.rst similarity index 100% rename from sphinx_doc_src/cmds/source.rst rename to doc_src/cmds/source.rst diff --git a/sphinx_doc_src/cmds/status.rst b/doc_src/cmds/status.rst similarity index 100% rename from sphinx_doc_src/cmds/status.rst rename to doc_src/cmds/status.rst diff --git a/sphinx_doc_src/cmds/string-collect.rst b/doc_src/cmds/string-collect.rst similarity index 100% rename from sphinx_doc_src/cmds/string-collect.rst rename to doc_src/cmds/string-collect.rst diff --git a/sphinx_doc_src/cmds/string-escape.rst b/doc_src/cmds/string-escape.rst similarity index 100% rename from sphinx_doc_src/cmds/string-escape.rst rename to doc_src/cmds/string-escape.rst diff --git a/sphinx_doc_src/cmds/string-join.rst b/doc_src/cmds/string-join.rst similarity index 100% rename from sphinx_doc_src/cmds/string-join.rst rename to doc_src/cmds/string-join.rst diff --git a/sphinx_doc_src/cmds/string-join0.rst b/doc_src/cmds/string-join0.rst similarity index 100% rename from sphinx_doc_src/cmds/string-join0.rst rename to doc_src/cmds/string-join0.rst diff --git a/sphinx_doc_src/cmds/string-length.rst b/doc_src/cmds/string-length.rst similarity index 100% rename from sphinx_doc_src/cmds/string-length.rst rename to doc_src/cmds/string-length.rst diff --git a/sphinx_doc_src/cmds/string-lower.rst b/doc_src/cmds/string-lower.rst similarity index 100% rename from sphinx_doc_src/cmds/string-lower.rst rename to doc_src/cmds/string-lower.rst diff --git a/sphinx_doc_src/cmds/string-match.rst b/doc_src/cmds/string-match.rst similarity index 100% rename from sphinx_doc_src/cmds/string-match.rst rename to doc_src/cmds/string-match.rst diff --git a/sphinx_doc_src/cmds/string-repeat.rst b/doc_src/cmds/string-repeat.rst similarity index 100% rename from sphinx_doc_src/cmds/string-repeat.rst rename to doc_src/cmds/string-repeat.rst diff --git a/sphinx_doc_src/cmds/string-replace.rst b/doc_src/cmds/string-replace.rst similarity index 100% rename from sphinx_doc_src/cmds/string-replace.rst rename to doc_src/cmds/string-replace.rst diff --git a/sphinx_doc_src/cmds/string-split.rst b/doc_src/cmds/string-split.rst similarity index 100% rename from sphinx_doc_src/cmds/string-split.rst rename to doc_src/cmds/string-split.rst diff --git a/sphinx_doc_src/cmds/string-split0.rst b/doc_src/cmds/string-split0.rst similarity index 100% rename from sphinx_doc_src/cmds/string-split0.rst rename to doc_src/cmds/string-split0.rst diff --git a/sphinx_doc_src/cmds/string-sub.rst b/doc_src/cmds/string-sub.rst similarity index 100% rename from sphinx_doc_src/cmds/string-sub.rst rename to doc_src/cmds/string-sub.rst diff --git a/sphinx_doc_src/cmds/string-trim.rst b/doc_src/cmds/string-trim.rst similarity index 100% rename from sphinx_doc_src/cmds/string-trim.rst rename to doc_src/cmds/string-trim.rst diff --git a/sphinx_doc_src/cmds/string-unescape.rst b/doc_src/cmds/string-unescape.rst similarity index 100% rename from sphinx_doc_src/cmds/string-unescape.rst rename to doc_src/cmds/string-unescape.rst diff --git a/sphinx_doc_src/cmds/string-upper.rst b/doc_src/cmds/string-upper.rst similarity index 100% rename from sphinx_doc_src/cmds/string-upper.rst rename to doc_src/cmds/string-upper.rst diff --git a/sphinx_doc_src/cmds/string.rst b/doc_src/cmds/string.rst similarity index 100% rename from sphinx_doc_src/cmds/string.rst rename to doc_src/cmds/string.rst diff --git a/sphinx_doc_src/cmds/suspend.rst b/doc_src/cmds/suspend.rst similarity index 100% rename from sphinx_doc_src/cmds/suspend.rst rename to doc_src/cmds/suspend.rst diff --git a/sphinx_doc_src/cmds/switch.rst b/doc_src/cmds/switch.rst similarity index 100% rename from sphinx_doc_src/cmds/switch.rst rename to doc_src/cmds/switch.rst diff --git a/sphinx_doc_src/cmds/test.rst b/doc_src/cmds/test.rst similarity index 100% rename from sphinx_doc_src/cmds/test.rst rename to doc_src/cmds/test.rst diff --git a/sphinx_doc_src/cmds/time.rst b/doc_src/cmds/time.rst similarity index 100% rename from sphinx_doc_src/cmds/time.rst rename to doc_src/cmds/time.rst diff --git a/sphinx_doc_src/cmds/trap.rst b/doc_src/cmds/trap.rst similarity index 100% rename from sphinx_doc_src/cmds/trap.rst rename to doc_src/cmds/trap.rst diff --git a/sphinx_doc_src/cmds/true.rst b/doc_src/cmds/true.rst similarity index 100% rename from sphinx_doc_src/cmds/true.rst rename to doc_src/cmds/true.rst diff --git a/sphinx_doc_src/cmds/type.rst b/doc_src/cmds/type.rst similarity index 100% rename from sphinx_doc_src/cmds/type.rst rename to doc_src/cmds/type.rst diff --git a/sphinx_doc_src/cmds/ulimit.rst b/doc_src/cmds/ulimit.rst similarity index 100% rename from sphinx_doc_src/cmds/ulimit.rst rename to doc_src/cmds/ulimit.rst diff --git a/sphinx_doc_src/cmds/umask.rst b/doc_src/cmds/umask.rst similarity index 100% rename from sphinx_doc_src/cmds/umask.rst rename to doc_src/cmds/umask.rst diff --git a/sphinx_doc_src/cmds/vared.rst b/doc_src/cmds/vared.rst similarity index 100% rename from sphinx_doc_src/cmds/vared.rst rename to doc_src/cmds/vared.rst diff --git a/sphinx_doc_src/cmds/wait.rst b/doc_src/cmds/wait.rst similarity index 100% rename from sphinx_doc_src/cmds/wait.rst rename to doc_src/cmds/wait.rst diff --git a/sphinx_doc_src/cmds/while.rst b/doc_src/cmds/while.rst similarity index 100% rename from sphinx_doc_src/cmds/while.rst rename to doc_src/cmds/while.rst diff --git a/sphinx_doc_src/commands.rst b/doc_src/commands.rst similarity index 100% rename from sphinx_doc_src/commands.rst rename to doc_src/commands.rst diff --git a/sphinx_doc_src/conf.py b/doc_src/conf.py similarity index 100% rename from sphinx_doc_src/conf.py rename to doc_src/conf.py diff --git a/sphinx_doc_src/design.rst b/doc_src/design.rst similarity index 100% rename from sphinx_doc_src/design.rst rename to doc_src/design.rst diff --git a/sphinx_doc_src/faq.rst b/doc_src/faq.rst similarity index 100% rename from sphinx_doc_src/faq.rst rename to doc_src/faq.rst diff --git a/sphinx_doc_src/fish_indent_lexer.py b/doc_src/fish_indent_lexer.py similarity index 100% rename from sphinx_doc_src/fish_indent_lexer.py rename to doc_src/fish_indent_lexer.py diff --git a/sphinx_doc_src/index.rst b/doc_src/index.rst similarity index 100% rename from sphinx_doc_src/index.rst rename to doc_src/index.rst diff --git a/sphinx_doc_src/license.rst b/doc_src/license.rst similarity index 100% rename from sphinx_doc_src/license.rst rename to doc_src/license.rst diff --git a/sphinx_doc_src/tutorial.rst b/doc_src/tutorial.rst similarity index 100% rename from sphinx_doc_src/tutorial.rst rename to doc_src/tutorial.rst diff --git a/src/builtin.cpp b/src/builtin.cpp index e3e0c7170..9975b361f 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -11,10 +11,10 @@ // 2). Add a line like { L"NAME", &builtin_NAME, N_(L"Bla bla bla") }, to the builtin_data_t // variable. The description is used by the completion system. Note that this array is sorted. // -// 3). Create a file sphinx_doc_src/NAME.rst, containing the manual for the builtin in +// 3). Create a file doc_src/NAME.rst, containing the manual for the builtin in // reStructuredText-format. Check the other builtin manuals for proper syntax. // -// 4). Use 'git add sphinx_doc_src/NAME.txt' to start tracking changes to the documentation file. +// 4). Use 'git add doc_src/NAME.txt' to start tracking changes to the documentation file. #include "config.h" // IWYU pragma: keep #include "builtin.h"