[pve-devel] applied: [PATCH docs 1/3] fix a/an and repeated words

[Fabian Grünbichler]

all three plus some cleanup

On Mon, Oct 02, 2017 at 03:55:38PM +0200, Thomas Lamprecht wrote:
> ddouble words found with /(\b\S+\b)\s+\b\1\b/
> (the silver searcher `ag` can find matches even with newlines in
> between without extra flags)
> 
> Adapt some wording when touching the lines.
> 
> Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
> ---
>  pve-network.adoc | 2 +-
>  pvecm.adoc       | 4 ++--
>  pveum.adoc       | 2 +-
>  qm.adoc          | 8 ++++----
>  4 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/pve-network.adoc b/pve-network.adoc
> index beb69ae..b34b8c1 100644
> --- a/pve-network.adoc
> +++ b/pve-network.adoc
> @@ -20,7 +20,7 @@ virtual networks.
>  
>  Debian traditionally uses the `ifup` and `ifdown` commands to
>  configure the network. The file `/etc/network/interfaces` contains the
> -whole network setup. Please refer to to manual page (`man interfaces`)
> +whole network setup. Please refer to the manual page (`man interfaces`)
>  for a complete format description.
>  
>  NOTE: {pve} does not write changes directly to
> diff --git a/pvecm.adoc b/pvecm.adoc
> index 4799670..36d18c2 100644
> --- a/pvecm.adoc
> +++ b/pvecm.adoc
> @@ -444,7 +444,7 @@ Separate On Cluster Creation
>  This is possible through the 'ring0_addr' and 'bindnet0_addr' parameter of
>  the 'pvecm create' command used for creating a new cluster.
>  
> -If you have setup a additional NIC with a static address on 10.10.10.1/25
> +If you have setup an additional NIC with a static address on 10.10.10.1/25
>  and want to send and receive all cluster communication over this interface
>  you would execute:
>  
> @@ -876,7 +876,7 @@ xref:pct_migration[Container Migration Chapter]
>  Migration Type
>  ~~~~~~~~~~~~~~
>  
> -The migration type defines if the migration data should be sent over a
> +The migration type defines if the migration data should be sent over an
>  encrypted (`secure`) channel or an unencrypted (`insecure`) one.
>  Setting the migration type to insecure means that the RAM content of a
>  virtual guest gets also transferred unencrypted, which can lead to
> diff --git a/pveum.adoc b/pveum.adoc
> index 30a5551..c3eb870 100644
> --- a/pveum.adoc
> +++ b/pveum.adoc
> @@ -100,7 +100,7 @@ usermod -a -G watchman heinz
>  Proxmox VE authentication server::
>  This is a unix like password store (`/etc/pve/priv/shadow.cfg`).
>  Password are encrypted using the SHA-256 hash method.
> -This is the most convenient method for for small (or even medium)
> +This is the most convenient method for small (or even medium)
>  installations where users do not need access to anything outside of
>  {pve}. In this case users are fully managed by {pve} and are able to
>  change their own passwords via the GUI.
> diff --git a/qm.adoc b/qm.adoc
> index 6cc8855..1cf9427 100644
> --- a/qm.adoc
> +++ b/qm.adoc
> @@ -130,7 +130,7 @@ Hard Disk
>  Qemu can emulate a number of storage controllers:
>  
>  * the *IDE* controller, has a design which goes back to the 1984 PC/AT disk
> -controller. Even if this controller has been superseded by more more designs,
> +controller. Even if this controller has been superseded by recent designs,
>  each and every OS you can think of has support for it, making it a great choice
>  if you want to run an OS released before 2003. You can connect up to 4 devices
>  on this controller.
> @@ -219,9 +219,9 @@ A *CPU socket* is a physical slot on a PC motherboard where you can plug a CPU.
>  This CPU can then contain one or many *cores*, which are independent
>  processing units. Whether you have a single CPU socket with 4 cores, or two CPU
>  sockets with two cores is mostly irrelevant from a performance point of view.
> -However some software is licensed depending on the number of sockets you have in
> -your machine, in that case it makes sense to set the number of of sockets to
> -what the license allows you, and increase the number of cores.
> +However some software licenses depend on the number of sockets a machine has,
> +in that case it makes sense to set the number of sockets to what the license
> +allows you.
>  
>  Increasing the number of virtual cpus (cores and sockets) will usually provide a
>  performance improvement though that is heavily dependent on the use of the VM.
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel