Merge branch 'master' into mask-fix

Ghostvv · Ghostvv · commit 853d554c855c · 2020-03-02T14:04:08.000+01:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -139,6 +139,7 @@
     "fixed_sidebar": True,
     "product": "Rasa",
     "base_url": "https://rasa.com/docs/rasa/",
+    "canonical_url": "https://rasa.com/docs/rasa/"
 }
 # html_theme_options = {}
 
diff --git a/docs/nlu/about.rst b/docs/nlu/about.rst
@@ -26,4 +26,4 @@ and returning structured data like
       }
     }
 
-Rasa NLU used to be a separate library, but it is now part of the Rasa framework.
+If you want to use Rasa NLU on its own, see :ref:`using-nlu-only`.

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@`
`139`	`139`	`"fixed_sidebar": True,`
`140`	`140`	`"product": "Rasa",`
`141`	`141`	`"base_url": "https://rasa.com/docs/rasa/",`
	`142`	`+ "canonical_url": "https://rasa.com/docs/rasa/"`
`142`	`143`	`}`
`143`	`144`	`# html_theme_options = {}`
`144`	`145`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ and returning structured data like`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-Rasa NLU used to be a separate library, but it is now part of the Rasa framework.`
	`29`	+If you want to use Rasa NLU on its own, see :ref:`using-nlu-only`.