Skip to content

Commit

Permalink
Merge pull request #107 from amousset/bug_6623/check_spelling_and_gra…
Browse files Browse the repository at this point in the history
…mmar_of_the_2_11_manual

Fixes #6623: Check spelling and grammar of the 2.11 manual
  • Loading branch information
Matthieu CERDA committed May 21, 2015
2 parents f103b05 + 69b181a commit bd003be
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion 11_install_agent/00_install_agent.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ of RAM during their execution. So you can safely install them on your servers.
We grouped all these tools in one package, to ease the Rudder Agent
installation.

To get the list of supported Operating systems.please refer to
To get the list of supported Operating systems, please refer to
<<Nodes_supported_OS, the list of supported Operating Systems for the Nodes>>.

====
Expand Down
4 changes: 2 additions & 2 deletions 21_node_management/22_search_nodes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ and y could be everything. You will to add that line to your search request:
- b. Composite search

Some fields allow you to look for more than one piece of information at a time.
That's the case for environment variable. for those fields you have to enter
That's the case for environment variable. For those fields you have to enter
the first element then the separator then following elements.
The name of the fields tells you about what is expected. it would look like
The name of the fields tells you about what is expected. It would look like
+firstelement<sep>secondelement+ assuming that <sep> is the separator.

.Search Environment Variable +LANG=C+.
Expand Down
4 changes: 2 additions & 2 deletions 21_node_management/23_groups_of_nodes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include::../glossary/static-group.txt[]
====

To create that dynamic group like described above, You first have to create a new group
with group type set to +Dynamic+. Then you have to set it's search request to :
with group type set to +Dynamic+. Then you have to set its search request to :

. Operator: +AND+.

Expand All @@ -27,7 +27,7 @@ with group type set to +Dynamic+. Then you have to set it's search request to :

. Third search line: 'Node summary', 'Ip address', +Regex+, '192\ .168\ .\d\ . .*' .

Finally you have to Click on Search to populate the group and click on Save to actually save it.
Finally, you have to click on Search to populate the group and click on Save to actually save it.

====

2 changes: 1 addition & 1 deletion 22_configuration_management/36_compliance.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=== Compliance

A Directive contains one or multiple components. Each component generates
one ore multiple reports, based on the number of keys in this component. For
one or multiple reports, based on the number of keys in this component. For
example, for a Sudoers Directive, each user is a key. These states are
available in reports:

Expand Down
2 changes: 1 addition & 1 deletion 23_administration/20_policy_server.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
=== Policy Server

The *Administartion > Policy Server Management* section sum-up information about
The *Administration > Policy Server Management* section sum-up information about
Rudder policy server and its parameters.

==== Configure allowed networks
Expand Down
2 changes: 1 addition & 1 deletion 23_administration/70_system_password_management.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ passwords.

On the majority of cases, this is fine, however you might want to adjust the
passwords manually. This is possible, just be cautious when editing the file,
as if you corrupt it Rudder will not be able to operate correclty anymore and
as if you corrupt it Rudder will not be able to operate correctly anymore and
will spit numerous errors in the program logs.

As of now, this file follows a simple syntax: ELEMENT:password
Expand Down
6 changes: 3 additions & 3 deletions 23_administration/80_user_management.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The credentials of a user are defined in the XML file
----

The name and password attributes are mandatory (non empty) for the user tags.
The role attribute can be omited but the user will have no permission, and
The role attribute can be omitted but the user will have no permission, and
only valid attributes are recognized.

Every modification of this file should be followed by a restart of the Rudder
Expand Down Expand Up @@ -88,7 +88,7 @@ Take care of the following limitation of the current process: only *authenticati
is delegated to LDAP, NOT *authorizations*. So you still have to
declare user's authorizations in the Rudder user file (rudder-users.xml).

An user whose authentication is accepted by LDAP but not declared in the
A user whose authentication is accepted by LDAP but not declared in the
rudder-users.xml file is considered to have no rights at all (and so will
only see a reduced version of Rudder homepage, with no action nor tabs available).

Expand Down Expand Up @@ -172,7 +172,7 @@ dashboard and nothing else.
|Name | Access level
|administrator | All authorizations granted, can access and modify everything
|administration_only | Only access to administration part of rudder, can do everything within it.
|user | Can access and modify eveything but the administration part
|user | Can access and modify everything but the administration part
|configuration | Can only access and act on configuration section
|read_only | Can access to every read only part, can perform no action
|inventory | Access to information about nodes, can see their inventory, but can't act on them
Expand Down
2 changes: 1 addition & 1 deletion 4_advanced_usage/10_node_management.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ root@node:~# cp -a /opt/rudder/share/initial-promises/* /var/rudder/cfengine-com

----

At next run of the Rudder Agent (it runs every five minuts), the initial promises will be used.
At next run of the Rudder Agent (it runs every five minutes), the initial promises will be used.

[CAUTION]

Expand Down
4 changes: 2 additions & 2 deletions 4_advanced_usage/11_node_install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Unable to lookup hostname (rudder-root) or cfengine service: Name or service not

----

To fix it, either you set up the agent to use the IP adress of the Rudder root
To fix it, either you set up the agent to use the IP address of the Rudder root
server instead of its Domain name, either you set up accurately the name
resolution of your Rudder Root Server, in your DNS server or in the hosts file.

Expand Down Expand Up @@ -149,7 +149,7 @@ ls /var/rudder/inventories/incoming/

On the next run of the CFEngine agent on Rudder Root Server, the new inventory
will be detected and sent to the Inventory Endpoint. The inventory will be then
moved in the directory of received inventories. The the Inventory Endpoint do
moved in the directory of received inventories. The Inventory Endpoint do
its job and the new Node appears in the interface.

You can force the execution of CFEngine agent on the console:
Expand Down
2 changes: 1 addition & 1 deletion 4_advanced_usage/77_distributed_rudder.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ cd rudder-multiserver-setup

Copy the rudder-multiserver-setup directory to you instance.

Run rudder-relay-top.sh as root, replace <rudder-*> with the hostname of the corrseponding instance:
Run rudder-relay-top.sh as root, replace <rudder-*> with the hostname of the corresponding instance:

----

Expand Down
2 changes: 1 addition & 1 deletion 4_advanced_usage/90_server_migration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ By copying that folder you will keep the git tree used by your server and keep y
- Go to *Administration > Archives*
- In Global Archive, "Choose an archive" select _Latest git commit_
- Click on _Restore everything_
- After deployement, your configuration should be restored
- After deployment, your configuration should be restored

===== Use Archive feature of Rudder

Expand Down
4 changes: 2 additions & 2 deletions 5_references/etc/rudder-users.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Custom authorisations are composed of two elements:
- A type of authorization, which define what is concerned
there's is 10 types, which are : node, group, deployement,
there's is 10 types, which are : node, group, deployment,
administration, configuration, rule, technique, directive,
validator and deployer.
- A level of authorization,
Expand All @@ -40,7 +40,7 @@
<user name="carol" password="xxxxxxx" role="user,validator"/>
<user name="custom" password="custom" role="node_all,configuration_read,rule_read,rule_edit,directive_read,technique_read">
- can read everything but administration,groups and deployement
- can read everything but administration,groups and deployment
- can do everything about node
exemple of bad lines
Expand Down
2 changes: 1 addition & 1 deletion 6_handbook/0_handbook_intro.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== Handbook

This chapter contains some tips and tricks you might want to know about using Rudder in a production environment, with some useful optimizations and procedures.
This chapter contains some tips and tricks you might want to know about using Rudder in a production environment, with some useful optimization and procedures.

2 changes: 1 addition & 1 deletion 6_handbook/10_database_maintenance.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ and will lock both the Rudder interface and the reporting system for quite a lon

----

# You can either use sudo to change owner to the postgres user, or use the rudder connexion credentials.
# You can either use sudo to change owner to the postgres user, or use the rudder connection credentials.

# With sudo:
sudo -u postgres psql -d rudder
Expand Down
4 changes: 2 additions & 2 deletions glossary/rudder.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rudder::

Rudder is a Drift Assesment software. Rudder associates Asset Management and
Configuration Management. Rudder is a Free Software developped by Normation.
Rudder is a Drift Assessment software. Rudder associates Asset Management and
Configuration Management. Rudder is a Free Software developed by Normation.

0 comments on commit bd003be

Please sign in to comment.