Merge branch '5.1' into 5

silverstripe · Oct 9, 2023 · a8c656f · a8c656f
2 parents 2435e70 + a586035
commit a8c656f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/...s/19_GraphQL/02_working_with_dataobjects/01_adding_dataobjects_to_the_schema.md b/...s/19_GraphQL/02_working_with_dataobjects/01_adding_dataobjects_to_the_schema.md
@@ -198,15 +198,16 @@ A couple things to note here:
 
 * By assigning a value of `true` to the field, we defer to the model to infer the type for the field. To override that, we can always add a `type` property:
 
-```yaml
-MyProject\Models\Product:
-  fields:
-    onSale:
-      type: Boolean
-```
+    ```yaml
+    MyProject\Models\Product:
+      fields:
+        onSale:
+          type: Boolean
+    ```
 
 * The mapping of our field names to the `DataObject` property is case-insensitive. It is a
 convention in GraphQL APIs to use lowerCamelCase fields, so this is given by default.
+
 [/notice]
 
 ### Bulk loading models
@@ -233,9 +234,9 @@ elemental: # An arbitrary key to define what these directives are doing
   load:
     inheritanceLoader:
       include:
-          - DNADesign\Elemental\Models\BaseElement
+        - DNADesign\Elemental\Models\BaseElement
       exclude:
-          - MyApp\Elements\MySecretElement
+        - MyApp\Elements\MySecretElement
   # Add all fields and read operations
   apply:
     fields:

diff --git a/en/03_Upgrading/07_Deprecations.md b/en/03_Upgrading/07_Deprecations.md
@@ -55,7 +55,7 @@ SilverStripe\Core\Injector\Injector:
   ErrorLogFileHandler:
     class: Monolog\Handler\StreamHandler
     constructor:
-      - "var/www/silverstripe.log"
+      - "/var/www/silverstripe.log"
       - "warning" # warning is the level deprecation warnings are logged as
   Psr\Log\LoggerInterface.errorhandler:
     calls: