Skip to content

Commit 2a509f3

Browse files
committed
Update release process
1 parent 9611cb7 commit 2a509f3

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

admin/RELEASE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA
5757
* Build the HTML version of the User Guide: `make html`
5858
* Build the ePub version of the User Guide: `make epub`
5959
* Switch to the **userguide** repo and create a new branch `release-4.x.x`
60-
* Copy the contents of **CodeIgniter4/user_guide_src/build/html** into **docs/**
60+
* Merge the contents of **CodeIgniter4/user_guide_src/build/html** into **docs/** (be sure to keep the assets in **docs/_static**)
6161
* Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to **./CodeIgniter4.x.x.epub**
6262
* Commit the changes with "Update for 4.x.x" and push to origin
6363
* Create a new PR from `release-4.x.x` to `develop`:
6464
* Title: "Update for 4.x.x"
6565
* Description: blank
66-
* Merge the PR then fast-forward `develop` to catch the merge commit
66+
* Merge the PR
6767
* Create a new Release:
6868
* Version: "v4.x.x"
6969
* Title: "CodeIgniter 4.x.x User Guide"
@@ -74,7 +74,7 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA
7474

7575
Currently the User Guide on the website has to be updated manually. Visit Jim's user home
7676
where the served directory **codeigniter.com** exists. Copy the latest **docs** folder from
77-
the User Guide repo into **public** and updated the symlink.
77+
the User Guide repo to **public/userguide4** and browse to the website to make sure.
7878

7979
## Announcement
8080

0 commit comments

Comments
 (0)