Merge branch 'modules-support-relative-path-2' of github.com:grafana/…

…alloy into modules-support-relative-path-2

docs/sources/reference/config-blocks/import.file.md

@@ -18,7 +18,7 @@ That means that you can define a custom component in one file and use it in anot
 in the same directory.
 
 You can use the keyword `module_path` in combination with the `stdlib` function [file.path_join][] to import a module relative to the current module's path.
-The `module_path` keyword works for modules that are imported via `import.file`, `import.git` and `import.string`.
+The `module_path` keyword works for modules that are imported via `import.file`, `import.git`, and `import.string`.
 
 ## Usage