diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-11-22 14:42:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-22 14:42:03 -0400 |
| commit | 1ba03e425ca48aa9d9c32861681c9e5b70abe881 (patch) | |
| tree | 2f162520589c649978a9986e8cce9e2e39c0e96c /src/Propellor/Property/Machine.hs | |
| parent | 85a6ca99ac40d521b3634af6f4f8c9f8b227a0ff (diff) | |
| parent | eebdd018cd4c3054c258eeb7a6b304b263d62a74 (diff) | |
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/Machine.hs')
| -rw-r--r-- | src/Propellor/Property/Machine.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Machine.hs b/src/Propellor/Property/Machine.hs index 80da62a1..0fe172b5 100644 --- a/src/Propellor/Property/Machine.hs +++ b/src/Propellor/Property/Machine.hs @@ -16,8 +16,8 @@ -- be functional at all without it, its property will include the non-free -- firmware, but if the non-free firmware is only needed for non-critical -- functionality, it won't be included. - --- | Example: Building a disk image for a Marvell SheevaPlug +-- +-- Example: Building a disk image for a Marvell SheevaPlug -- -- This defines a Host "sheeva" that is a Marvell SheevaPlug. -- A bootable disk image for "sheeva" is built on another machine |