Merge branch '6-dev' of github.com:plone/documentation into 6-dev

� Conflicts:
�	Makefile

Author: stevepiercy

Makefile

@@ -170,7 +170,7 @@ linkcheck: deps  ## Run linkcheck
 
 .PHONY: linkcheckbroken
 linkcheckbroken: deps  ## Run linkcheck and show only broken links
-	cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | GREP_COLORS='0;31' egrep -wi "broken\|redirect" --color=auto
+	cd $(DOCS_DIR) && $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck | GREP_COLORS='0;31' grep -wi "broken\|redirect" --color=auto
 	@echo
 	@echo "Link check complete; look for any errors in the above output " \
 		"or in $(BUILDDIR)/linkcheck/ ."

docs/classic-ui/images.md

@@ -1,8 +1,8 @@
 ---
 html_meta:
-  "description": "Image resolution and scaling in Plone Classic UI"
-  "property=og:description": "Image resolution and scaling in Plone Classic UI"
-  "property=og:title": "Image resolving and scaling"
+  "description": "Image resolving and scaling in Plone Classic UI"
+  "property=og:description": "Image resolving and scaling in Plone Classic UI"
+  "property=og:title": "Image Handling"
   "keywords": "Plone, Classic UI, classic-ui, image, resize, scale"
 ---