[web-wiki] master: Update README with new commit to re-apply after update (if needed)
| From: | Derick Rethans | Date: | Tue, 19 Aug 2025 14:08:48 +0000 |
| Subject: | [web-wiki] master: Update README with new commit to re-apply after update (if needed) | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-33117@lists.php.net to get a copy of this message | ||
Author: Derick Rethans (derickr)
Date: 2025-08-19T15:08:41+01:00
Commit: https://github.com/php/web-wiki/commit/69f7b4810fdd96bb6379a28529c855e10217a52e
Raw diff: https://github.com/php/web-wiki/commit/69f7b4810fdd96bb6379a28529c855e10217a52e.diff
Update README with new commit to re-apply after update (if needed)
Changed paths:
M README.rst
Diff:
diff --git a/README.rst b/README.rst
index 6771b544..13c0eb2c 100644
--- a/README.rst
+++ b/README.rst
@@ -20,7 +20,8 @@ Upgrades
- Restore `
register.txt via git restore --
dokuwiki/inc/lang/en/register.txt`
- Restore `resetpwd.txt via git restore --
dokuwiki/inc/lang/en/resetpwd.txt`
- Restore `entities.conf via git restore --
dokuwiki/conf/entities.conf`
-- Reapply `3f6e9d7e7380d1e7a31e6d1203ea5b9b9a20cdaf`
+- Reapply commits (for auth, and rendering just the username):
+ `git cherry-pick 3f6e9d7e7380d1e7a31e6d1203ea5b9b9a20cdaf
3afc81ab78f4e5278bb0c6c4c0d390a1c8d43913`
- Review the changes (not every detail in larger upgrades of course)
- Commit and push
- The wiki server will pull the new GIT content through rsync automatically