Merge remote-tracking branch 'origin/master' into devel

master
Gina Häußge 2013-03-02 12:02:18 +01:00
commit b3bbfb4574
1 changed files with 2 additions and 2 deletions

View File

@ -212,7 +212,7 @@ This should hopefully run through without any compilation errors. You should the
o: commands..........: enabled
If you now point your browser to `http://<your Raspi's IP>:8080/?action=stream`, you should see a moving picture at 5fps.
Open `~/.octoprint/config.ini` and add the following lines to it:
Open `~/.octoprint/config.yaml` and add the following lines to it:
webcam:
stream: http://<your Raspi's IP>:8080/?action=stream
@ -270,4 +270,4 @@ After that you might also want to rename your base directory (which probably sti
and delete the folder `printer_webui` in your base folder (which stays there thanks to Python's compiled bytecode files
even after a rename of the Python package to `octoprint`).
After that you are set, the configuration files are migrated automatically.
After that you are set, the configuration files are migrated automatically.