update path references, move NEWS files back

DFHack · Nov 30, 2022 · cd69103 · cd69103
1 parent e952957
commit cd69103
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/ci/authors-rst.py b/ci/authors-rst.py
@@ -11,9 +11,9 @@ def error(line, msg, **kwargs):
             info += ' %s %s:' % (k, kwargs[k])
         print('line %i:%s %s' % (line, info, msg))
         if os.environ.get('GITHUB_ACTIONS'):
-            print('::error file=docs/Authors.rst,line=%i::%s %s' % (line, info.lstrip(), msg))
+            print('::error file=docs/about/Authors.rst,line=%i::%s %s' % (line, info.lstrip(), msg))
         success[0] = False
-    with open('docs/Authors.rst', 'rb') as f:
+    with open('docs/about/Authors.rst', 'rb') as f:
         lines = list(map(lambda line: line.decode('utf8').replace('\n', ''), f.readlines()))
 
         if lines[1].startswith('='):

diff --git a/ci/lint-ignore.txt b/ci/lint-ignore.txt
@@ -10,9 +10,14 @@ plugins/stonesense/*.txt
 # Generated files
 *.pb.h
 build*/*
-docs/_*
+docs/changelogs/*
 docs/html/*
 docs/pdf/*
+docs/pseudoxml/*
+docs/tags/*
+docs/text/*
+docs/tools/*
+docs/xml/*
 library/include/df/*
 
 # Dependencies that we don't control

diff --git a/docs/dev/NEWS-dev.rst → docs/NEWS-dev.rst b/docs/dev/NEWS-dev.rst → docs/NEWS-dev.rst
diff --git a/docs/about/NEWS.rst → docs/NEWS.rst b/docs/about/NEWS.rst → docs/NEWS.rst
diff --git a/docs/about/index.rst b/docs/about/index.rst
@@ -10,4 +10,4 @@ These pages contain information about the general DFHack project.
    /docs/about/Authors
    /LICENSE
    /docs/about/Removed
-   /docs/about/NEWS
+   /docs/NEWS
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,7 +1,7 @@
 === Scroll down for changes
 
 ===[[[
-The text below is included in docs/Documentation.rst - see that file for more details on the changelog setup.
+The text below is included in docs/dev/Documentation.rst - see that file for more details on the changelog setup.
 This is kept in this file as a quick syntax reference.
 
 ===help

diff --git a/docs/dev/Contributing.rst b/docs/dev/Contributing.rst
@@ -92,7 +92,7 @@ General contribution guidelines
   compiles. Our CI should catch anything that fails to build, but checking in
   advance can sometimes let you know of any issues sooner.
 * Update documentation when applicable - see `docs-standards` for details.
-* Update ``changelog.txt`` and ``docs/Authors.rst`` when applicable. See
+* Update ``docs/changelog.txt`` and ``docs/about/Authors.rst`` when applicable. See
   `build-changelog` for more information on the changelog format.
 * Submit ideas and bug reports as :issue:`issues on GitHub <>`.
   Posts in the forum thread can easily get missed or forgotten.

diff --git a/docs/dev/index.rst b/docs/dev/index.rst
@@ -18,4 +18,4 @@ These are pages relevant to people developing for DFHack.
    /docs/dev/Memory-research
    /docs/dev/Binpatches
    /docs/dev/Remote
-   /docs/dev/NEWS-dev
+   /docs/NEWS-dev