Auto commit 2024-07-03 15:26

diff --git a/Le droit d'asile pour les nuls/index.html b/Le droit d'asile pour les nuls/index.html
index d1bf32b1c849c5e503cbcaf53b04449909728b9a..41c74d8d5671799035905ecc6551f849ef801d16 100644 (file)
--- a/Le droit d'asile pour les nuls/index.html
+++ b/Le droit d'asile pour les nuls/index.html
@@ -742,7 +742,7 @@ des questions ou des zones d’ombre à éclaircir, n’hésitez pas !</p>
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/Phone/Framagenda/index.html b/Phone/Framagenda/index.html
index 1f167a0c3e06826f0c16e46816d4eecd478f995a..6cd0a6e261dd3f4d7f457f093ac23216518ef91b 100644 (file)
--- a/Phone/Framagenda/index.html
+++ b/Phone/Framagenda/index.html
@@ -453,7 +453,7 @@
     
       <script src="../../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/color-theme/index.html b/color-theme/index.html
index 219dbff5fba44fdc4703384f2658610427020b47..15ac7816497c1d18b3d062286b7806ea66f12da0 100644 (file)
--- a/color-theme/index.html
+++ b/color-theme/index.html
@@ -558,7 +558,7 @@
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/git/index.html b/git/index.html
index 3e01f67b4efc6dcce814518fb2dfb1c900f3d922..5896d6970f124e3d439a0af8ffd1fba5ab936e82 100644 (file)
--- a/git/index.html
+++ b/git/index.html
@@ -450,9 +450,11 @@
 
 
 <h1 id="git">Git</h1>
-<p>Set upstream:
-- <code>git push --set-upstream remote_name local_branch</code>
-- <code>git pull --set-upstream remote_name local_branch</code></p>
+<p>Set upstream:</p>
+<ul>
+<li><code>git push --set-upstream remote_name local_branch</code></li>
+<li><code>git pull --set-upstream remote_name local_branch</code></li>
+</ul>
 <p>Delete branch:</p>
 <ul>
 <li><code>git branch -d xxx</code></li>
@@ -460,32 +462,52 @@
 <li><code>git push MY_REMOTE --delete XXX</code></li>
 <li><code>git push MY_REMOTE :XXX</code> (identical to above)</li>
 </ul>
-<p>Move branch
-* <code>git checkout OLD_NAME</code>
-* <code>git branch -m NEW_NAME</code></p>
-<p>Active branch in a bare repository:
-* see <code>repo/HEAD</code> (and change it if needed)</p>
-<p>Create a new branch and switch to it:
-* <code>git checkout -b BRANCH</code></p>
-<p>Merge unrelated repositories:
-* <code>git pull ../other/ master --allow-unrelated-histories --no-rebase</code></p>
+<p>Move branch:</p>
+<ul>
+<li><code>git checkout OLD_NAME</code></li>
+<li><code>git branch -m NEW_NAME</code></li>
+</ul>
+<p>Active branch in a bare repository:</p>
+<ul>
+<li>see <code>repo/HEAD</code> (and change it if needed)</li>
+</ul>
+<p>Create a new branch and switch to it:</p>
+<ul>
+<li><code>git checkout -b BRANCH</code></li>
+</ul>
+<p>Merge unrelated repositories:</p>
+<ul>
+<li><code>git pull ../other/ master --allow-unrelated-histories --no-rebase</code></li>
+</ul>
 <h2 id="submodules">Submodules</h2>
-<p>At start:
-* <code>git clone XXX --recurse-submodules</code></p>
-<p>At new one:
-* git submodule add https://github.com/... path
-* <code>./</code> is allowed, <code>.</code> is not <em>but only on remote paths, not local paths</em>
-* <code>../other-prj.git</code> is also allowed</p>
-<p>Manually:
-* git submodule init
-* git submodule update (--recursive)</p>
-<p>Or in one command:
-* git submodule update --init (--recursive)</p>
-<p>If problems:
-* git submodule deinit (--all)</p>
-<p>If head detached:
-* <code>git branch -u &lt;origin&gt;/&lt;branch&gt; &lt;branch&gt;</code>
-* <code>git checkout -b &lt;branch&gt; --track &lt;origin&gt;/&lt;branch&gt;</code></p>
+<p>At start:</p>
+<ul>
+<li><code>git clone XXX --recurse-submodules</code></li>
+</ul>
+<p>At new one:</p>
+<ul>
+<li>git submodule add https://github.com/... path</li>
+<li><code>./</code> is allowed, <code>.</code> is not <em>but only on remote paths, not local paths</em></li>
+<li><code>../other-prj.git</code> is also allowed</li>
+</ul>
+<p>Manually:</p>
+<ul>
+<li>git submodule init</li>
+<li>git submodule update (--recursive)</li>
+</ul>
+<p>Or in one command:</p>
+<ul>
+<li>git submodule update --init (--recursive)</li>
+</ul>
+<p>If problems:</p>
+<ul>
+<li>git submodule deinit (--all)</li>
+</ul>
+<p>If head detached:</p>
+<ul>
+<li><code>git branch -u &lt;origin&gt;/&lt;branch&gt; &lt;branch&gt;</code></li>
+<li><code>git checkout -b &lt;branch&gt; --track &lt;origin&gt;/&lt;branch&gt;</code></li>
+</ul>
 <p>The <code>git submodule sync</code> will update your config file with the details from the .gitmodules file, so the latter should be considered the 'master'.</p>
 
 
@@ -538,7 +560,7 @@
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml
deleted file mode 100644 (file)
index aefe3d7..0000000
--- a/mkdocs/mkdocs.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-site_name: Niki's Doc
-theme:
-  name: material
-  features:
-    - content.action.edit
-plugins:
-  - privacy
-# - offline
-#repo_url: https://github.com/nikiroo/fanfix
-# repo_name: squidfunk/mkdocs-material
-#edit_uri: edit/master/docs/

diff --git a/mkdocs/update.sh b/mkdocs/update.sh
deleted file mode 100644 (file)
index a179585..0000000
--- a/mkdocs/update.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-DDIR=/home/user/Notes
-
-if [ "$1" = "" ]; then
-       # Host
-       cd "`dirname "$0"`"
-       if [ $? != 0 ]; then
-               echo Cannot find directory \
-                       | tee mkdocs/error.txt >&2
-               exit 42
-       fi
-       cd ..
-       rm -f mkdocs/ok mkdocs/error.txt
-       touch mkdocs/wip
-       OPTS="-v $PWD:$DDIR:rw" /opt/docker/launch.sh \
-               --start $DDIR/mkdocs/update.sh mkdocs \
-               build
-       echo
-       echo Leaving docker machine...
-       echo
-       [ -e mkdocs/ok ] ; rep=$? ; rm -f mkdocs/ok
-       if [ $rep = 0 ]; then
-               echo Copying to remote site...
-               cd mkdocs/site
-               git add .
-               if [ $? != 0 ]; then
-                       echo Failure to add newly built html site \
-                               | tee mkdocs/error.txt >&2
-                       exit 20
-               fi
-               git commit -m "`date +"Auto commit %Y-%m-%d %H:%M"`"
-               if [ $? != 0 ]; then
-                       echo Failure to commit to git \
-                               | tee mkdocs/error.txt >&2
-                       exit 21
-               fi
-               git push nikiroo html
-               if [ $? != 0 ]; then
-                       echo Failure to push html branch to nikiroo \
-                               | tee mkdocs/error.txt >&2
-                       exit 22
-               fi
-       else
-               echo Failed to update, no remote copy started: $rep \
-                               | tee mkdocs/error.txt >&2
-       fi
-       rm -f mkdocs/wip
-       exit $rep
-fi
-
-# Docker
-echo
-echo Entering docker machine...
-echo
-
-cd
-cp "$DDIR/mkdocs/mkdocs.yml" "$HOME/" || exit
-ln -s "$DDIR" docs || exit
-mkdocs build -d "$DDIR"/mkdocs/site || exit
-touch "$DDIR/mkdocs/ok"
-

diff --git a/mkdocs/wip b/mkdocs/wip
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/mp4/index.html b/mp4/index.html
index b2e9c4467c341c69836e2092abe38a9f4af050b5..e5d110d9003b185f8c25a472ef845d8dd285d85d 100644 (file)
--- a/mp4/index.html
+++ b/mp4/index.html
@@ -998,7 +998,7 @@ All the flags not part of an input files (after the last <code>-i</code>) target
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/scaling/index.html b/scaling/index.html
index 7178f28b492469146aa1cc023a5591ff5d28fff1..0d6c14b0c749a986455d6dce2ef96f9c3e3022b9 100644 (file)
--- a/scaling/index.html
+++ b/scaling/index.html
@@ -705,7 +705,7 @@ xrandr --fb 1574x884 --output eDP1 --mode 1366x768 --panning 1574x886 --scale 1.
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>

diff --git a/sitemap.xml.gz b/sitemap.xml.gz
index a8b7781f0e21b75a3a68d5bd188de51ea9909561..f5d8e971e0ff9aed16a964de36e7de369db07ad9 100644 (file)
Binary files a/sitemap.xml.gz and b/sitemap.xml.gz differ

diff --git a/web-css/index.html b/web-css/index.html
index 56ce40de7a6d5b7dc1cc57720faeea8c8d791f24..f4f2ecfa8cf8b32cfc4ab9a16a2ab4834ac54941 100644 (file)
--- a/web-css/index.html
+++ b/web-css/index.html
@@ -566,7 +566,7 @@ h1 :has(h2) { margin: 0 0 0.25rem 0; } /* less margin if a H2 follows it */
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>