Merge remote-tracking branch 'origin/rewrite' into rewrite

# Conflicts:
#	docs/route.md
This commit is contained in:
Leo Horie 2016-12-06 00:10:30 -05:00
commit 3fb160c12e
2 changed files with 13 additions and 3 deletions

View file

@ -257,7 +257,7 @@ m.route(document.body, "/edit/pictures/image.jpg", {
---
### Changing route prefix
### Changing router prefix
The router prefix is a fragment of the URL that dictates the underlying [strategy](routing-strategies.md) used by the router.