Move to doc/

minetest · Feb 17, 2019 · 4018dc9 · 4018dc9
1 parent 8d7794a
commit 4018dc9
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,8 +65,8 @@ doc/doxygen_*
 
 ## MkDocs files
 public/
-mkdocs/docs/*.md
-mkdocs/mkdocs.yml
+doc/mkdocs/docs/*.md
+doc/mkdocs/mkdocs.yml
 
 ## Build files
 CMakeFiles

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -331,7 +331,7 @@ pages:
     - pip install git+https://github.com/mkdocs/mkdocs.git
     - pip install pygments
   script:
-    - cd mkdocs && ./build.sh
+    - cd doc/mkdocs && ./build.sh
   artifacts:
     paths:
       - public

diff --git a/mkdocs/build.sh → doc/mkdocs/build.sh b/mkdocs/build.sh → doc/mkdocs/build.sh
@@ -7,7 +7,7 @@ patch -N -r - $PYGMENTS_FILE code_tag.patch || true
 patch -N -r - $MARKDOWN_FILE lua_highlight.patch || true
 
 # Split lua_api.txt on top level headings
-cat ../doc/lua_api.txt | csplit -sz -f docs/section - '/^=/-1' '{*}'
+cat ../lua_api.txt | csplit -sz -f docs/section - '/^=/-1' '{*}'
 
 cat > mkdocs.yml << EOF
 site_name: Minetest API Documentation
@@ -40,4 +40,4 @@ do
 	echo "- \"$title\": $fname" >> mkdocs.yml
 done
 
-mkdocs build --site-dir ../public
+mkdocs build --site-dir ../../public
diff --git a/mkdocs/code_tag.patch → doc/mkdocs/code_tag.patch b/mkdocs/code_tag.patch → doc/mkdocs/code_tag.patch
diff --git a/mkdocs/docs/css/code_styles.css → doc/mkdocs/docs/css/code_styles.css b/mkdocs/docs/css/code_styles.css → doc/mkdocs/docs/css/code_styles.css
diff --git a/mkdocs/docs/css/extra.css → doc/mkdocs/docs/css/extra.css b/mkdocs/docs/css/extra.css → doc/mkdocs/docs/css/extra.css
diff --git a/doc/mkdocs/docs/img/favicon.ico b/doc/mkdocs/docs/img/favicon.ico
@@ -0,0 +1 @@
+../../../../misc/minetest-icon.ico
diff --git a/mkdocs/lua_highlight.patch → doc/mkdocs/lua_highlight.patch b/mkdocs/lua_highlight.patch → doc/mkdocs/lua_highlight.patch
diff --git a/mkdocs/docs/img/favicon.ico b/mkdocs/docs/img/favicon.ico