2021-03-02T11:30:01Z

45 files changed, 434 insertions, 452 deletions

diff --git a/R_Overlay.html b/R_Overlay.html
index 191d2978bf16..b5fb42880adc 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -50,19 +50,19 @@
 </pre></td></tr>
             <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Matched data: 0 bytes
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.36M
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>File list size: 2.38M
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list generation time: 0.001 seconds
 </pre></td></tr>
             <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.61K
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes sent: 17.59K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes received: 2.62M
 </pre></td></tr>
             <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.61K bytes  received 2.62M bytes  1.05M bytes/sec
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>sent 17.59K bytes  received 2.62M bytes  1.76M bytes/sec
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>total size is 61.12M  speedup is 23.18
 </pre></td></tr>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index 6f2352159594..14bd4a08cd48 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -18,13 +18,13 @@ Total file size: 61.12M bytes
 Total transferred file size: 0 bytes
 Literal data: 0 bytes
 Matched data: 0 bytes
-File list size: 2.36M
+File list size: 2.38M
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 17.61K
+Total bytes sent: 17.59K
 Total bytes received: 2.62M
 
-sent 17.61K bytes  received 2.62M bytes  1.05M bytes/sec
+sent 17.59K bytes  received 2.62M bytes  1.76M bytes/sec
 total size is 61.12M  speedup is 23.18
 *** syncing R_Overlay
 *** synced R_Overlay
diff --git a/didactic-duck.html b/didactic-duck.html
index 4e2e629b4775..cb1da5ce5f60 100644
--- a/didactic-duck.html
+++ b/didactic-duck.html
@@ -34,69 +34,67 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync didactic-duck
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing didactic-duck
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing didactic-duck
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced didactic-duck
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced didactic-duck
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 didactic-duck
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 didactic-duck
-</pre></td></tr>
-            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-i18n/scim-1.4.14-r1: failed sourcing ebuild: EAPI=4 is not supported
+            <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-i18n/scim-1.4.14-r1: failed sourcing ebuild: EAPI=4 is not supported
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-misc/workrave-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-misc/workrave-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-portage/tatt-0.3_p: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-portage/tatt-0.3_p: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-lang/v8-3.18.5.14: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-lang/v8-3.18.5.14: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-lang/v8-3.19.18.19: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-lang/v8-3.19.18.19: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-lang/v8-3.25.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-lang/v8-3.25.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-util/perf-4.4.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-util/perf-4.4.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * games-util/games_nebula-0_alpha20180605: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * games-util/games_nebula-0_alpha20180605: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * mate-base/mate-applets-1.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * mate-base/mate-applets-1.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-sound/gpodder-3.8.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-sound/gpodder-3.8.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/didactic-duck.txt b/didactic-duck.txt
index 94db4c227588..7c73f19500ca 100644
--- a/didactic-duck.txt
+++ b/didactic-duck.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/lucianposton/didactic-duck.git'}],
  'status': 'unofficial'}
 $ pmaint sync didactic-duck
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dilfridge.html b/dilfridge.html
index 0a5de4f4d7f8..08e289ad72a7 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -44,49 +44,47 @@
 </pre></td></tr>
             <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dilfridge
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing dilfridge
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing dilfridge
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dilfridge
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced dilfridge
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dilfridge
 </pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dilfridge
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dilfridge.txt b/dilfridge.txt
index a4afd38a430e..208172d3485d 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -15,7 +15,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}],
  'status': 'official'}
 $ pmaint sync dilfridge
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/displacer.html b/displacer.html
index dda3b47dcef5..45e91e4760fd 100644
--- a/displacer.html
+++ b/displacer.html
@@ -42,49 +42,47 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync displacer
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing displacer
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing displacer
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced displacer
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced displacer
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 displacer
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 displacer
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/displacer.txt b/displacer.txt
index 1c401ea40ead..ebe7ce826048 100644
--- a/displacer.txt
+++ b/displacer.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/displacer.git'}],
  'status': 'unofficial'}
 $ pmaint sync displacer
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/distros.html b/distros.html
index ee5b36545169..b0ee16cfab03 100644
--- a/distros.html
+++ b/distros.html
@@ -28,49 +28,47 @@
 </pre></td></tr>
             <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync distros
 </pre></td></tr>
-            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation.
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing distros
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing distros
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced distros
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced distros
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 distros
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 distros
-</pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/distros.txt b/distros.txt
index f86bb1f272e4..c9685d1e335a 100644
--- a/distros.txt
+++ b/distros.txt
@@ -7,7 +7,6 @@
              'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync distros
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/djc.html b/djc.html
index 88bded86f6e4..2708c8c06e3d 100644
--- a/djc.html
+++ b/djc.html
@@ -36,49 +36,47 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync djc
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing djc
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing djc
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced djc
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced djc
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 djc
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 djc
-</pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/djc.txt b/djc.txt
index 46b8c533be8f..dcb6e68766dd 100644
--- a/djc.txt
+++ b/djc.txt
@@ -11,7 +11,6 @@
             {'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync djc
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dlang.html b/dlang.html
index 4ed7c9e27804..1b67a3d2467c 100644
--- a/dlang.html
+++ b/dlang.html
@@ -34,47 +34,49 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dlang
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dlang
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dlang
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dlang
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dlang
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
+</pre></td></tr>
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dlang.txt b/dlang.txt
index 72f7ce9719f0..8e082494f5c1 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -10,6 +10,7 @@
             {'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
  'status': 'unofficial'}
 $ pmaint sync dlang
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dmchurch.html b/dmchurch.html
index b06ed7e23b07..bfe6d865f129 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -42,49 +42,47 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync dmchurch
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing dmchurch
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing dmchurch
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced dmchurch
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dmchurch
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dmchurch
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dmchurch
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dmchurch.txt b/dmchurch.txt
index 20c9a8feb418..9b4af70e302f 100644
--- a/dmchurch.txt
+++ b/dmchurch.txt
@@ -14,7 +14,6 @@
              'uri': 'git@github.com:dmchurch/portage-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync dmchurch
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/docker.html b/docker.html
index 58d987f10401..46f3d7566846 100644
--- a/docker.html
+++ b/docker.html
@@ -40,81 +40,83 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync docker
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing docker
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced docker
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing docker
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced docker
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 docker
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 docker
+</pre></td></tr>
+            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-emulation/docker-0.5.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-emulation/docker-0.6.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-emulation/docker-0.6.1-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-emulation/docker-0.6.1-r2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-emulation/docker-0.6.1-r3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-emulation/docker-0.6.1-r4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-emulation/docker-0.6.2: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-emulation/docker-0.6.2-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-emulation/docker-0.6.3: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-emulation/docker-0.6.3-r1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-emulation/docker-0.6.4: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-emulation/docker-0.6.5: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-emulation/docker-0.6.6: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-emulation/docker-0.6.7: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-emulation/docker-0.7.0: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-util/gordon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sys-auth/notary-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 </pre></td><td>[FATAL]</td></tr>
-            <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regen failed with 1
+            <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regen failed with 1
 </pre></td></tr>
 
         </table>
diff --git a/docker.txt b/docker.txt
index dfeaf29f0af0..bc05b0a7e596 100644
--- a/docker.txt
+++ b/docker.txt
@@ -13,6 +13,7 @@
             {'type': 'git', 'uri': 'git@github.com:tianon/docker-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync docker
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/drdim.html b/drdim.html
index c2d495ca0faa..f7bdb2bda40b 100644
--- a/drdim.html
+++ b/drdim.html
@@ -38,47 +38,49 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync drdim
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing drdim
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced drdim
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing drdim
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced drdim
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/drdim.txt b/drdim.txt
index 68f4b01219ba..b4e46479dda1 100644
--- a/drdim.txt
+++ b/drdim.txt
@@ -12,6 +12,7 @@
             {'type': 'git', 'uri': 'git@github.com:drdim/layman.git'}],
  'status': 'unofficial'}
 $ pmaint sync drdim
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/dwfreed.html b/dwfreed.html
index 4f8393b7ebc2..8fa98cd545af 100644
--- a/dwfreed.html
+++ b/dwfreed.html
@@ -34,47 +34,49 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dwfreed
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing dwfreed
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced dwfreed
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing dwfreed
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dwfreed
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwfreed
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwfreed
+</pre></td></tr>
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/dwfreed.txt b/dwfreed.txt
index 4caa20d090bd..e0daa3a141cc 100644
--- a/dwfreed.txt
+++ b/dwfreed.txt
@@ -10,6 +10,7 @@
              'uri': 'https://bitbucket.org/dwfreed/dwfreed.gentoo'}],
  'status': 'unofficial'}
 $ pmaint sync dwfreed
+WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/gentoo.html b/gentoo.html
index 77ec4afc416c..ac6f7bf766b1 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -64,31 +64,21 @@
 </pre></td></tr>
             <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>   fed044159b9..e70de09f0e0  master     -&gt; origin/master
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing gentoo
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Updating fed044159b9..e70de09f0e0
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gentoo
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Fast-forward
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild | 1 +
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> 1 file changed, 1 insertion(+)
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing gentoo
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
-            <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
-</pre></td></tr>
-            <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/gentoo.txt b/gentoo.txt
index 096c766912e5..8058c350aba2 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,12 +25,7 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.
 
-From https://anongit.gentoo.org/git/repo/gentoo
-   fed044159b9..e70de09f0e0  master     -> origin/master
-Updating fed044159b9..e70de09f0e0
-Fast-forward
- net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1.ebuild | 1 +
- 1 file changed, 1 insertion(+)
+Already up to date.
 *** syncing gentoo
 *** synced gentoo
  * Sync succeeded
diff --git a/index.html b/index.html
index 4afd689e10c4..885ff071ec54 100644
--- a/index.html
+++ b/index.html
@@ -919,7 +919,7 @@
 
         </table>
 
-        <address>Generated based on results from 2021-03-02 11:21:44 UTC</address>
+        <address>Generated based on results from 2021-03-02 11:36:47 UTC</address>
     </body>
 </html>
         
\ No newline at end of file
diff --git a/poly-c.html b/poly-c.html
index 1efebf99bbdd..95c64911f77b 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -112,7 +112,7 @@
 </pre></td></tr>
             <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes  received 131 bytes  61.71 bytes/sec
+            <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>sent 85 bytes  received 131 bytes  86.40 bytes/sec
 </pre></td></tr>
             <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/poly-c.txt b/poly-c.txt
index 6f1b93d979e5..c0e5c701d328 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -49,7 +49,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 131
 
-sent 85 bytes  received 131 bytes  61.71 bytes/sec
+sent 85 bytes  received 131 bytes  86.40 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing poly-c
 *** synced poly-c
diff --git a/unc3nsored.html b/unc3nsored.html
index 2b4f5716b3bb..b96e0199ab31 100644
--- a/unc3nsored.html
+++ b/unc3nsored.html
@@ -34,49 +34,47 @@
 </pre></td></tr>
             <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync unc3nsored
 </pre></td></tr>
-            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing unc3nsored
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing unc3nsored
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced unc3nsored
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced unc3nsored
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unc3nsored
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unc3nsored
-</pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/unc3nsored.txt b/unc3nsored.txt
index cfff2dfb7eaa..2c3ad323b9c8 100644
--- a/unc3nsored.txt
+++ b/unc3nsored.txt
@@ -10,7 +10,6 @@
              'uri': 'https://github.com/xxc3nsoredxx/unc3nsored.git'}],
  'status': 'unofficial'}
 $ pmaint sync unc3nsored
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/vdr-devel.html b/vdr-devel.html
index 8b53bd413f0e..958c6d986993 100644
--- a/vdr-devel.html
+++ b/vdr-devel.html
@@ -42,49 +42,47 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vdr-devel
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vdr-devel
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing vdr-devel
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vdr-devel
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced vdr-devel
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
-</pre></td></tr>
-            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/vdr-devel.txt b/vdr-devel.txt
index 2d214f025d16..3030c6762174 100644
--- a/vdr-devel.txt
+++ b/vdr-devel.txt
@@ -14,7 +14,6 @@
              'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}],
  'status': 'official'}
 $ pmaint sync vdr-devel
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/vifino-overlay.html b/vifino-overlay.html
index abbb9d4861fc..6e160c224a66 100644
--- a/vifino-overlay.html
+++ b/vifino-overlay.html
@@ -40,49 +40,47 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing vifino-overlay
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vifino-overlay
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
-</pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/vifino-overlay.txt b/vifino-overlay.txt
index b4d7eb198a1c..b0f4462d7de7 100644
--- a/vifino-overlay.txt
+++ b/vifino-overlay.txt
@@ -13,7 +13,6 @@
             {'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}],
  'status': 'unofficial'}
 $ pmaint sync vifino-overlay
-WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/waffle-builds.html b/waffle-builds.html
index 30e38e851e72..eed035b52648 100644
--- a/waffle-builds.html
+++ b/waffle-builds.html
@@ -38,47 +38,49 @@
 </pre></td></tr>
             <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync waffle-builds
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing waffle-builds
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced waffle-builds
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing waffle-builds
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced waffle-builds
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
+</pre></td></tr>
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/waffle-builds.txt b/waffle-builds.txt
index 193e436ba689..af727029972a 100644
--- a/waffle-builds.txt
+++ b/waffle-builds.txt
@@ -12,6 +12,7 @@
              'uri': 'git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git'}],
  'status': 'unofficial'}
 $ pmaint sync waffle-builds
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/wayland-desktop.html b/wayland-desktop.html
index 3c89d2663fd9..cd82cbcc8d4a 100644
--- a/wayland-desktop.html
+++ b/wayland-desktop.html
@@ -36,47 +36,49 @@
 </pre></td></tr>
             <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync wayland-desktop
 </pre></td></tr>
-            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing wayland-desktop
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced wayland-desktop
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing wayland-desktop
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced wayland-desktop
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wayland-desktop
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wayland-desktop
+</pre></td></tr>
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/wayland-desktop.txt b/wayland-desktop.txt
index e7bc6c3389a1..fbafd8aff863 100644
--- a/wayland-desktop.txt
+++ b/wayland-desktop.txt
@@ -11,6 +11,7 @@
              'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}],
  'status': 'unofficial'}
 $ pmaint sync wayland-desktop
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/wbrana.html b/wbrana.html
index ae59f1eb38d2..73392039c2d7 100644
--- a/wbrana.html
+++ b/wbrana.html
@@ -40,47 +40,49 @@
 </pre></td></tr>
             <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync wbrana
 </pre></td></tr>
-            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** syncing wbrana
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced wbrana
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing wbrana
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced wbrana
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wbrana
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wbrana
+</pre></td></tr>
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/wbrana.txt b/wbrana.txt
index fb7d9f8002de..16aee9684c4d 100644
--- a/wbrana.txt
+++ b/wbrana.txt
@@ -13,6 +13,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/wbrana.git'}],
  'status': 'unofficial'}
 $ pmaint sync wbrana
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/wdzierzan.html b/wdzierzan.html
index 2ffe53967e8f..0cfc3231ff91 100644
--- a/wdzierzan.html
+++ b/wdzierzan.html
@@ -42,47 +42,49 @@
 </pre></td></tr>
             <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wdzierzan
 </pre></td></tr>
-            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+            <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 </pre></td></tr>
-            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+            <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
 </pre></td></tr>
-            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
+            <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
 </pre></td></tr>
-            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
+            <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
 </pre></td></tr>
-            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
+            <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase true   # rebase
+            <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>  git config pull.rebase false  # merge (the default strategy)
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>  git config pull.rebase true   # rebase
 </pre></td></tr>
-            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+            <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>  git config pull.ff only       # fast-forward only
 </pre></td></tr>
-            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
+            <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
 </pre></td></tr>
-            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+            <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
 </pre></td></tr>
-            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+            <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
 </pre></td></tr>
-            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+            <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing wdzierzan
+            <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
 </pre></td></tr>
-            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced wdzierzan
+            <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing wdzierzan
 </pre></td></tr>
-            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+            <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced wdzierzan
 </pre></td></tr>
-            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+            <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
 </pre></td></tr>
-            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wdzierzan
+            <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
 </pre></td></tr>
-            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
+            <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wdzierzan
+</pre></td></tr>
+            <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
 </pre></td></tr>
 
         </table>
diff --git a/wdzierzan.txt b/wdzierzan.txt
index 9c69103aa5a0..beef1feb3b4e 100644
--- a/wdzierzan.txt
+++ b/wdzierzan.txt
@@ -14,6 +14,7 @@
              'uri': 'git+ssh://git@git.gentoo.org/user/wdzierzan.git'}],
  'status': 'unofficial'}
 $ pmaint sync wdzierzan
+WARNING:pkgcore:tranquility repo at '/var/lib/repo-mirror-ci/sync/tranquility', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 warning: Pulling without specifying how to reconcile divergent branches is
 discouraged. You can squelch this message by running one of the following
 commands sometime before your next pull:
diff --git a/xwing.html b/xwing.html
index d0aec6374630..3de7a1e8b98c 100644
--- a/xwing.html
+++ b/xwing.html
@@ -78,7 +78,7 @@
 </pre></td></tr>
             <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes  received 134 bytes  87.60 bytes/sec
+            <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>sent 85 bytes  received 134 bytes  62.57 bytes/sec
 </pre></td></tr>
             <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>total size is 32  speedup is 0.15
 </pre></td></tr>
diff --git a/xwing.txt b/xwing.txt
index 674126a68e1c..bab0ac474133 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -32,7 +32,7 @@ File list transfer time: 0.000 seconds
 Total bytes sent: 85
 Total bytes received: 134
 
-sent 85 bytes  received 134 bytes  87.60 bytes/sec
+sent 85 bytes  received 134 bytes  62.57 bytes/sec
 total size is 32  speedup is 0.15
 *** syncing xwing
 *** synced xwing
diff --git a/zugaina.html b/zugaina.html
index b1eca3264e81..7d4ee6a03c68 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -54,15 +54,15 @@
 </pre></td></tr>
             <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list transfer time: 0.000 seconds
 </pre></td></tr>
-            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 491
+            <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Total bytes sent: 483
 </pre></td></tr>
             <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total bytes received: 46.48K
 </pre></td></tr>
             <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
 </pre></td></tr>
-            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 491 bytes  received 46.48K bytes  18.79K bytes/sec
+            <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>sent 483 bytes  received 46.48K bytes  18.79K bytes/sec
 </pre></td></tr>
-            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M  speedup is 46.61
+            <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>total size is 2.19M  speedup is 46.62
 </pre></td></tr>
             <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing zugaina
 </pre></td></tr>
diff --git a/zugaina.txt b/zugaina.txt
index 91b6c8988bef..11753082da04 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -20,11 +20,11 @@ Matched data: 0 bytes
 File list size: 43.29K
 File list generation time: 0.001 seconds
 File list transfer time: 0.000 seconds
-Total bytes sent: 491
+Total bytes sent: 483
 Total bytes received: 46.48K
 
-sent 491 bytes  received 46.48K bytes  18.79K bytes/sec
-total size is 2.19M  speedup is 46.61
+sent 483 bytes  received 46.48K bytes  18.79K bytes/sec
+total size is 2.19M  speedup is 46.62
 *** syncing zugaina
 *** synced zugaina
  * Sync succeeded