rc2 build updates plus small misc fixes

zencart · Mar 16, 2024 · f936c59 · f936c59
1 parent 6844a5e
commit f936c59
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 2 deletions.
diff --git a/content/dev/release_process/pre_release_notes.md b/content/dev/release_process/pre_release_notes.md
@@ -13,6 +13,8 @@ The master branch is now the current release.  If a patch is being done from a r
 
 ## Versioning files 
 
+Before doing the version updates, create a new branch specifically for these changes. 
+
 Here's what should be in these files for version 2.0.0-alpha1:
 
 |#|File | Version 

diff --git a/content/dev/release_process/prerequisites.md b/content/dev/release_process/prerequisites.md
@@ -27,6 +27,8 @@ Once you have these things, you're almost ready to begin.
 
 NOTE: If you are setting up a pre-release, please see [Pre-Release Notes](/dev/release_process/pre_release_notes/).
 
+Before doing the version updates, create a new branch specifically for these changes. 
+
 1. Edit the file `includes/version.php` and update the version.
 
 1. Edit the file `zc_install/includes/version.php` and update the version.
@@ -101,7 +103,7 @@ Do copyright updates in the following files:
 
 ## Check in! 
 
-You'll want to check in all these changes so they get version stamped correctly. 
+You'll want to check in all these changes so they get version stamped correctly.  Merge the branch you created for these changes. 
 
 
 

diff --git a/content/dev/release_process/release_log.md b/content/dev/release_process/release_log.md
@@ -4,6 +4,16 @@ weight: 100
 layout: docs
 category: release_process
 ---
+# v2.0.0-rc2
+
+Built 16 March 2024
+
+first_hash = ebb5fa877e5c8a645ad7e7f2c86b8da6d81cb64a 
+
+last_hash = d6da68ea718a04f2975571adeccc862e69f223d7
+
+initial version stamping commit = https://github.com/zencart/zencart/commit/6e8017472943eb362b5be68b0efd53a76b48f155
+
 # v2.0.0-rc1
 
 Built 09 March 2024

diff --git a/content/dev/release_process/release_tagging.md b/content/dev/release_process/release_tagging.md
@@ -30,7 +30,9 @@ git tag --list
 
 **Note:** The tag *must* be the same as the `newVersion` setting in the versionstamper's `config.php` file. 
 
-`git tag v1.5.8` obviously replacing the release name as appropriate
+`git tag v1.5.8` 
+
+obviously replacing the release name as appropriate.
 
 Typically this tag will be updated on the remote too.  Check 
 https://github.com/zencart/zencart/tags to be sure.  If it's not there, do 

diff --git a/content/user/about_us/whats_new.md b/content/user/about_us/whats_new.md
@@ -5,6 +5,7 @@ category: about_us
 weight: 10
 ---
 
+- March 2024: [Reminder to migrate off the old UPS API](https://www.zen-cart.com/showthread.php?229812-UPS-XML-will-stop-working-June-2024-(here-s-new-OAUTH-module)&p=1399614#post1399614) posted on forum.  Two months left to upgrade to [UPS Shipping RESTful API](https://www.zen-cart.com/downloads.php?do=file&id=2374) or update your custom code.  The old API will stop working on  **June 3, 2024**.
 - March 2024: Release Candidate 1 for 2.0.0 was built; here's the [2.0.0 RC 1 Feedback](https://www.zen-cart.com/showthread.php?229991-Feedback-on-2-0-0-rc1) forum thread. 
 - February 2024: The [Edit Orders](https://www.zen-cart.com/downloads.php?do=file&id=1513) plugin has been updated for Zen Cart 1.5.8.
 - February 2024: The PayPal integration for Zen Cart has been refreshed with the newer [PayPal RESTful API](/user/payment/paypal_restful/).  The new plugin [PayPal RESTful API](https://www.zen-cart.com/downloads.php?do=file&id=2382) Production Release 1.0 was just completed.  This will eventually replace our older PayPal integrations. 

diff --git a/content/user/admin_pages/modules/plugin_manager.md b/content/user/admin_pages/modules/plugin_manager.md
@@ -7,3 +7,12 @@ weight: 40
 The Plugin Manager page provides a single place to install and uninstall plugins created in accordance with the new [encapsulated plugin architecture](/dev/plugins/encapsulated_plugins/) introduced in 1.5.7. 
 
 The base install of Zen Cart contains the Display Logs plugin, both as an example and as a useful feature.  Other encapsulated plugins are available in the [plugin library](https://www.zen-cart.com/downloads.php). 
+
+Other notable plugins that have been converted to use encapsulation are:
+
+- [Sales Report](https://www.zen-cart.com/downloads.php?do=file&id=9)
+- [Clone a Template](https://www.zen-cart.com/downloads.php?do=file&id=2087)
+- [Mod List](https://www.zen-cart.com/downloads.php?do=file&id=2039) 
+
+Developers seeking more information about this topic should read [the dev documents on encapsulation](/dev/plugins/encapsulated_plugins/).
+
diff --git a/content/user/locations/zone_definitions.md b/content/user/locations/zone_definitions.md
@@ -38,6 +38,11 @@ Here are the required steps:
 - Press Insert, and select Country = "United States" and Zone = "Hawaii".  Press Insert. 
 - You're done!  You now have a new zone you can use anywhere Zone restriction is allowed, such as a shipping module's configuration. 
 
+<hr>
+
+**Note:** The procedures described in the remainder of this document
+are direct changes to your database which are best performed in phpMyAdmin, not the "Install SQL Patches" tool. 
+
 ### To create a Zone for the US Continental 48 States & DC
 
 ```