Skip to content

Commit

Permalink
Merge branch 'fix-rename-markdowns' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
sedrubal committed Jun 5, 2016
2 parents bbbb3db + 91f690d commit 4672a16
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 6 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion FabLabKasse/cashPayment/protocol.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ STOP

------

(Service mode: refilling is normal via ACCEPT command - this money will be counted just like money paid in by the user and therefore needs a corrective transfer in the cash audit log. see README.cashPayment)
(Service mode: refilling is normal via ACCEPT command - this money will be counted just like money paid in by the user and therefore needs a corrective transfer in the cash audit log. see README_cashPayment.md)
2 changes: 1 addition & 1 deletion FabLabKasse/config.ini.example
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ payout_impossible_product_id=9994
[cash_payment]
; only used when cash=on in [payup_methods]
; devices (*.py files in cashPayment/server/)
; please read README.cashPayment ! larger devices first, because they are used first for payout.
; please read README_cashPayment.md ! larger devices first, because they are used first for payout.
;device1=exampleServer
;device1_name=example1
;device2=mdbCoinChanger
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Please checkout the repository recursively since it contains submodules:

`git clone --recursive git@github.com:fau-fablab/FabLabKasse.git`

If you want to test on a VM, take a look at Vagrant.README.md on how to automatically set up a Virtualbox VM for testing.
If you want to test on a VM, take a look at [README_Vagrant.md](README_Vagrant.md) on how to automatically set up a Virtualbox VM for testing.

See INSTALLING for detailed instructions on how to install the required dependencies. You can skip the configuration stuff for later.
See [INSTALLING.md](INSTALLING.md) for detailed instructions on how to install the required dependencies. You can skip the configuration stuff for later.

Then, for the first try, you can just do:

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Code structure overview
- the rest of the code is in folder FabLabKasse
- kassenbuch.py (currently still german) accounting CLI for legacy_offline_kassenbuch shopping backend
- produkt.py is directly in FabLabKasse-folder for legacy reasons
- cashPayment: automated cash payment - coin and banknote acceptors. see README.cashPayment
- cashPayment: automated cash payment - coin and banknote acceptors. see README_cashPayment.md

- client: interface towards the GUI that connects with the device drivers

Expand Down
2 changes: 1 addition & 1 deletion install_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sudo cp /home/$INSTALL_USER/FabLabKasse/FabLabKasse/tools/sudoers.d/kassenterm-r
# load example config if no config.ini exists
cd /home/$INSTALL_USER/FabLabKasse/ && sudo -u $INSTALL_USER ./run.py --example --only-load-config
echo "Warning: if no config exists, an example config will be installed. Please change it if you use this for a real system"
echo "Warning: For using it on a real system, cronjobs must be setup manually, please see INSTALLING"
echo "Warning: For using it on a real system, cronjobs must be setup manually, please see INSTALLING.md"

sudo service nodm stop
sleep 2
Expand Down

0 comments on commit 4672a16

Please sign in to comment.