Merge remote-tracking branch 'gh/master' into develop

modules/juce_core/xml/juce_XmlDocument.h

@@ -41,7 +41,7 @@
     @code
 
     XmlDocument myDocument (File ("myfile.xml"));
-    XmlElement* mainElement = myDocument.getDocumentElement();
+    ScopedPointer<XmlElement> mainElement (myDocument.getDocumentElement());
 
     if (mainElement == nullptr)
     {
@@ -57,7 +57,7 @@
     Or you can use the static helper methods for quick parsing..
 
     @code
-    XmlElement* xml = XmlDocument::parse (myXmlFile);
+    ScopedPointer<XmlElement> xml (XmlDocument::parse (myXmlFile));
 
     if (xml != nullptr && xml->hasTagName ("foobar"))
     {

modules/juce_gui_basics/buttons/juce_TextButton.h

@@ -102,7 +102,7 @@ public:
 
 private:
    #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
-    // Note that this method has been removed - instead, see LookAndFeel::getTextButtonWidthToFitText()
+    // Note that this method has been removed - instead, see LookAndFeel::getTextButtonFont()
     virtual int getFont() { return 0; }
    #endif