Merge branch 'issue_1206-wiki-gpl-rm'

Author: nerdvegas

.github/workflows/wiki.yaml

@@ -14,8 +14,6 @@ jobs:
   build:
     name: Build Wiki Artifact
     runs-on: ubuntu-latest
-    env:
-      TEMP_WIKI_DIR: "wiki/.rez-gen-wiki-tmp"
 
     steps:
       - uses: actions/checkout@v2
@@ -32,16 +30,15 @@ jobs:
           rezver=$(cat ./src/rez/utils/_version.py | grep -w _rez_version | tr '"' ' ' | awk '{print $NF}')
 
           python update-wiki.py \
-            --keep-temp \
-            --no-push \
+            --github-repo="${{ github.repository }}" \
             --github-release=${rezver} \
-            --wiki-dir="${{ github.workspace }}"/"${{ env.TEMP_WIKI_DIR }}" \
-            --wiki-url="${{ env.CLONE_URL }}"
+            --wiki-url="${{ env.CLONE_URL }}" \
+            --out="${{ github.workspace }}/out"
 
       - uses: actions/upload-artifact@v2
         with:
           name: wiki-markdown
-          path: ${{ env.TEMP_WIKI_DIR }}
+          path: out
 
   publish:
     name: Publish to GitHub Wiki

wiki/pages/Command-Line-Tools.md

@@ -0,0 +1 @@
+__GENERATED_MD__

wiki/pages/_Configuring-Rez.md wiki/pages/Configuring-Rez.mdwiki/pages/_Configuring-Rez.md renamed to wiki/pages/Configuring-Rez.md

@@ -2,7 +2,7 @@
 
 Rez has a good number of configurable settings. The default settings, and
 documentation for every setting, can be found
-[here](https://github.com/__GITHUB_REPO__/blob/master/src/rez/rezconfig.py).
+[here](https://github.com/__GITHUB_REPO__/blob/__GITHUB_BRANCH__/src/rez/rezconfig.py).
 
 Settings are determined in the following way:
 

wiki/pages/_Credits.md wiki/pages/Credits.mdwiki/pages/_Credits.md renamed to wiki/pages/Credits.md

@@ -1,5 +1,3 @@
-
-
 ## Contributors
 
 <p align="center">