From 4ad208c8639626606120004547d9ad55cde7ddf0 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Fri, 8 Jan 2016 10:48:36 +0100 Subject: [PATCH] Fixed typos. --- README.md | 12 ++++++------ examples/ansible/README.md | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c925b52..dbe249b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The software in this kit includes the following: 3. A [set of commands for SaltStack `salt-ssh`](./bin/) that fake SSH and SCP using `bombshell-client` to enable SaltStack management of Qubes OS VMs. -4. A set of [action plugions for Ansible](./ansible/action_plugins/) that +4. A set of [action plugins for Ansible](./ansible/action_plugins/) that interface with the new [Qubes OS 3.1 Salt management stack](https://www.qubes-os.org/news/2015/12/14/mgmt-stack/). 5. A [set of DevOps automation skeletons / examples](./examples/) to get you up and @@ -29,12 +29,12 @@ The software in this kit includes the following: depend on it, can be used to run operations from one VM to another, in the following combinations: -* Qubes VM -> Qubes VM +* Qubes VM -> Qubes VM * Qubes VM -> Qubes `dom0` (see below for enablement instructions) * Qubes `dom0` -> Qubes VM -* Qubes VM -> network (SSH) -> Qubes VM in another machine (see below for +* Qubes VM -> network (SSH) -> Qubes VM on another Qubes host (see below for enablement instructions) -* normal desktop Linux -> network (SSH) -> Qubes VM in another machine +* normal desktop Linux -> network (SSH) -> Qubes VM on another Qubes host What this means for you is quite simple. With this toolkit, you can completely script the setup and maintenance of an entire network of Qubes OS machines. @@ -52,7 +52,7 @@ Contributions always welcome. Bombshell remote shell technology --------------------------------- -Bombshell is a way to run commands in other VMs, that employs the `bombshell-client` script on this repository. Said method is now integrated in these programs and will only work with Qubes OS 3. +Bombshell is a way to run commands in other VMs, that employs the `bombshell-client` script from this repository. Said method is now integrated in these programs and will only work with Qubes OS 3. Direct (non-Ansible and non-SaltStack) usage instructions: @@ -69,7 +69,7 @@ Fairly simple: ./bombshell-client vmname bash starts an interactive bash shell (without a prompt, as there is no tty) -on the machine `vmname`. Any progran can be run in this way. For +on the machine `vmname`. Any program can be run in this way. For example: ./bombshell-client vmname hostname diff --git a/examples/ansible/README.md b/examples/ansible/README.md index 3126578..cf38913 100644 --- a/examples/ansible/README.md +++ b/examples/ansible/README.md @@ -157,7 +157,7 @@ Playbooks --------- Everything you've seen so far applies to simple `ansible` runs. But the real -worth of Ansible is the possiblity to weave repeatable, idempotent scripts +worth of Ansible is the possibility to weave repeatable, idempotent scripts that involve multiple machines, so you're not constantly repeating yourself. Enter [`ansible-playbook`](https://docs.ansible.com/ansible/playbooks.html), generously documented there, and exemplified here. @@ -185,6 +185,6 @@ We ship several different sample playbooks: your template VM, which can later be turned on via the Services tab of the properties window of VMs based on the template. In the example, the service is named `qubes-helloworld`, so that would be the name - of the service toadd and enable on the Services tab. + of the service to add and enable on the Services tab. More will come as time goes by. For now, that's all. Happy hacking!