@@ -50,7 +96,7 @@ Version 2.0 and later versions may have new requirements that will thrive on new
- Removal of the single-month selection trigger for determining the crop stage/s
- Removal of the rainfall condition trigger
2. Public/admin 10-day recommendations and bulletin PDF generation
- - Removal of the dates trigger within the active PAGASA 10-day date range for determining the crop stage/s
+ - Removal of the single-date selection trigger within the active PAGASA 10-day date range for determining the crop stage/s
3. Deprecation of the **uploaders** group of Node Package Manager (NPM) scripts in favor of cropping calendar/recommendations Excel file upload through the UI
4. Allow creating seasonal bulletin PDFs with more than one (1) page.
5. Text blast recipients by province/municipality instead of individual selection
@@ -68,7 +114,9 @@ ACAP 1.0's last stable version is Release/Tag version [**v9.5.6**](https://githu
Version 1.0 marks the initial ACAP Bicol release used as a base model and template for subsequent developer training and sharing with other regions in the succeeding years starting on [**July 2023**](https://uplbfi.org/?p=2097).
-It has the following features, strictly following and is tested compatible with the recommended [Security](/security) and [Server](/directories/server) guidelines:
+Developed with a Security-first approach, ACAP 1.0 especially notes common Firestore security pitfalls and keeps a watchful eye on Cross-Site Scripting (XSS) attacks since it uses What-You-See-Is-What-You-Get (WYSIWYG) HTML input for crop recommendations and PDF generation.
+
+It has the following features, strictly following and is tested compatible with the recommended [Security](/security) and [Server](/directories/server) guidelines:
diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx
index 3dd87308..9072632e 100644
--- a/docs/pages/installation.mdx
+++ b/docs/pages/installation.mdx
@@ -37,12 +37,16 @@ For detailed instructions on these steps, refer to the [Post-Installation](/post
If you are working on a forked repository behind several updates from the parent **`acap-v2`** repository, you can get the latest updates or bug fixes using any of the options:
-- "Sync" to the parent repository
-- Create a Pull Request (PR) from the parent repository (**acap-v2**) to your forked repository, then merge/resolve conflicts.
+- "Sync" to the parent repository's `dev` branch.
+
+ Take care not to "discard" your commits.
+
+- Create a Pull Request (PR) from the parent repository's (**acap-v2**) - **`dev`** branch to your forked repository, then merge/resolve conflicts.
+- `cherry-pick` target commit(s) from the parent `dev` branch to the `dev` branch of your forked repository.
- Pick only the target updates/fixes, then commit them to your fork.
Project Maintainers occasionally update the parent repository **acap-v2** for maintenance, bug fixes, and minor/optional updates. Sometimes, massive new feature updates.
-Of the three (3) repository syncing options mentioned, doing the first or second options ensures up-to-date sync with the latest updates and bug fixes.
+Of the four (4) repository syncing options mentioned, doing the first or second options ensures up-to-date sync with the latest updates and bug fixes.
\ No newline at end of file