Docs: Sync latest master docs with 7.5.x (#33156)

* Docs: Sync latest master docs with 7.5.x

* remove some remaining next aliases and links

* Docs: Removed v8 doc changes

* fixed merge issue

docs/sources/dashboards/dashboard_folders.md

@@ -46,6 +46,6 @@ The Dashboard Folder Page is similar to the Manage Dashboards page and is where
 
 Permissions can be assigned to a folder and inherited by the containing dashboards. An Access Control List (ACL) is used where
 **Organization Role**, **Team** and Individual **User** can be assigned permissions. Read the
- [Dashboard and Folder Permissions]({{< relref "../permissions/dashboard_folder_permissions.md" >}}) docs for more detail
+ [Dashboard and Folder Permissions]({{< relref "../permissions/dashboard-folder-permissions.md" >}}) docs for more detail
  on the permission system.
 

docs/sources/dashboards/time-range-controls.md

@@ -26,8 +26,12 @@ Here are some examples:
 | Last 5 minutes         | `now-5m`   | `now`      |
 | The day so far         | `now/d`    | `now`      |
 | This week              | `now/w`    | `now/w`    |
-| Week to date           | `now/w`    | `now`      |
+| This week so far       | `now/w`    | `now`      |
+| This month             | `now/M`    | `now/M`    |
+| This month so far      | `now/M`    | `now`      |
 | Previous Month         | `now-1M/M` | `now-1M/M` |
+| This year so far       | `now/Y`    | `now`      |
+| This Year              | `now/Y`    | `now/Y     |
 
 ## Common time range controls