Merge branch 'main' into two-migration-options-to-show-acccess-report…

…s-on-web
SSWConsulting · Dec 15, 2023 · daec8fd · daec8fd
2 parents 270707e + 3d337f4
commit daec8fd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 40 deletions.
diff --git a/categories/reporting-solutions/rules-to-better-reporting-services.md b/categories/reporting-solutions/rules-to-better-reporting-services.md
@@ -15,8 +15,6 @@ index:
 - five-user-experiences-of-reporting-services
 - when-to-use-reporting-services
 - check-that-rs-configuration-manager-is-all-green-ticks
-- check-out-built-in-samples
-- two-migration-options-to-show-acccess-reports-on-web
 
 ---
 

diff --git a/rules/do-you-zz-old-files-rather-than-deleting-them/rule.md b/rules/do-you-zz-old-files-rather-than-deleting-them/rule.md
@@ -16,9 +16,7 @@ redirects: []
 created: 2009-03-02T02:45:33.000Z
 archivedreason: null
 guid: 89900a3a-2e3d-4d72-b935-0949bd1cd8ed
-
 ---
-
 When you are regularly creating new releases of a cool .NET application or simply producing new proposals in Microsoft Word, files will inevitably become **outdated**. Rather than deleting them, put a 'zz' at the front of the filename. These old versions should not be deleted straight away - it is just an unnecessary risk! The zz'd files can remain there until you need more space, then you should delete them. 
 
 <!--endintro-->
@@ -49,8 +47,9 @@ When uploading to some video hosting sites, like Vimeo, you can update a video b
 In YouTube an uploaded video can't be replaced, so to create a new version of a video it will be uploaded as a new video with a new URL. 
 
 So that there are no broken or missing links, the video status is set to "unlisted", and we use the 'zz' process:
-- Add 'zz' to the beginning of the title.
-- Add a link to the latest version at the top of the description
+
+* Add 'zz' to the beginning of the title.
+* Add a link to the latest version at the top of the description
 
 ::: good
 ![Figure: Good example of the 'zz' process for YouTube videos](https://tv.ssw.com/wp-content/uploads/2021/09/zz-process-youtube.png)
@@ -63,3 +62,9 @@ When you see ‘zz’ in the title of the video description, it’s important to
 On YouTube click the ‘New Version’ link in the description.
 
 ![Figure: How to access the latest video in the subject section](https://github.com/SSWConsulting/SSW.Rules.Content/assets/147477898/748b40ce-792b-4400-84ca-5c759aa72148)
+
+::: info
+
+If you are deleting something that uses resources and/or cost money, it is a good idea to 'zz' it first - and use a follow up to remind yourself to delete it after a reasonable amount of time, as per: https://www.ssw.com.au/rules/follow-up-effectively/
+
+:::
diff --git a/rules/salary-sacrifice-electronic-devices/rule.md b/rules/salary-sacrifice-electronic-devices/rule.md
@@ -29,7 +29,7 @@ Are you planning to buy a cool laptop to boost your productivity? You can place
 
 In Australia, salary sacrificing is when your employer agrees to pay for your device(s) with your pre-tax salary, therefore you pay less tax.
 
-Most companies will let you salary sacrifice FBT-exempted portable electronic devices that:
+Most companies will let you salary sacrifice FBT-exempted ([Fringe benefit tax](https://www.forgov.qld.gov.au/finance-and-procurement/finance-travel-and-assets/taxation-and-financial-management/manage-taxation/fringe-benefits-tax-fbt)) portable electronic devices that:
 
 * Are used predominantly for work-related purposes
 * Are easily portable and designed for use away from an office environment
@@ -77,4 +77,4 @@ Let's look at how he saves **$2,500** on the new laptop.
 | 💻 GST on Purchase                | $ 0.5                        | $ 0                       |
 | **Take-home pay**                 | **$ 68.5k**                  | **$ 71k**                 |
 
-**Figure: Bob saved $2,500 on take-home pay with salary sacrificing**
+**Figure: Bob saved $2,500 on take-home pay with salary sacrificing**
diff --git a/rules/salary-terminology/rule.md b/rules/salary-terminology/rule.md
@@ -3,13 +3,13 @@ type: rule
 title: Do you use consistent salary terminology?
 uri: salary-terminology
 authors:
- - title: Adam Cogan
-   url: https://ssw.com.au/people/adam-cogan
- - title: Levi Jackson
-   url: https://www.ssw.com.au/people/levi-jackson
-related: 
- - as-per-our-conversation-emails
- - salary-sacrifice-electronic-devices
+  - title: Adam Cogan
+    url: https://ssw.com.au/people/adam-cogan
+  - title: Levi Jackson
+    url: https://www.ssw.com.au/people/levi-jackson
+related:
+  - as-per-our-conversation-emails
+  - salary-sacrifice-electronic-devices
 created: 2023-12-13T05:54:23.387Z
 guid: 7371f1b6-a773-4707-97b8-e70621fa20bf
 ---
@@ -20,31 +20,20 @@ When discussing pay, ambiguity is a foe. Terms like 'salary' or 'pay' are too va
 
 In Australia, there is a mix of terms used:
 
-❌ Remuneration
-
-❌ Total Remuneration Package (TRP)
-
-❌ Remuneration Package
-
-❌ Remuneration paid to an employee as a reward for their services
-
-❌ Pay
-
-❌ Pay Terms
-
-❌ Payment Package
-
-❌ Salary Package
-
-❌ Earnings
-
-❌ Compensation
-
-❌ Compensation Package
-
-❌ Wage structure
-
-✅ **Salary Package Including Super**
+* Remuneration
+* Total Remuneration Package (TRP)
+* Remuneration Package
+* Remuneration paid to an employee as a reward for their services
+* Pay
+* Pay Terms
+* Payment Package
+* Salary
+* Salary Package
+* Earnings
+* Compensation
+* Compensation Package
+* Wage structure
+* Salary Package Including Super (Recommended ✅) 
 
 The last option is the best because it prevents misunderstandings. The term makes it clear that the figure **includes** superannuation contribution, which is essential to avoid the unpleasant surprise of salary shock where employees may not realize that super is part of their total pay.