Merge branch 'master' into fix/empty-anchor-tags

Author: tuxmea

_data/nav/openvox_8x.yml

@@ -251,6 +251,16 @@
     link: "functions_ruby_documenting.html"
   - text: Writing functions (legacy Ruby API --- avoid)
     link: "functions_legacy.html"
+- text: Designing system configs (roles and profiles)
+  items:
+  - text: The roles and profiles method
+    link: "the_roles_and_profiles_method.html"
+  - text: Roles and profiles example
+    link: "roles_and_profiles_example.html"
+  - text: Designing advanced profiles
+    link: "designing_advanced_profiles.html"
+  - text: Designing convenient roles
+    link: "designing_convenient_roles.html"
 - text: Hiera
   items:
   - text: Hiera

docs/_openvox_8x/config_file_auth.markdown

@@ -6,7 +6,7 @@ title: "Config files: auth.conf (LEGACY)"
 [rest_authconfig]: ./configuration.html#restauthconfig
 [api]: ./http_api/http_api_index.html
 [default_file]: https://github.com/puppetlabs/puppet/blob/4.3.0/conf/auth.conf
-[environment]: ./environments.html
+[environment]: ./environments_about.html
 [server_ca]: /openvox-server/latest/config_file_ca.html
 [server_master]: /openvox-server/latest/config_file_master.html
 [server_auth_conf]: /openvox-server/latest/config_file_auth.html

docs/_openvox_8x/config_file_environment.markdown

@@ -3,8 +3,8 @@ layout: default
 title: "Config files: environment.conf"
 ---
 
-[environment]: ./environments.html
-[environmentpath]: ./environments.html#about-environmentpath
+[environment]: ./environments_about.html
+[environmentpath]: ./environments_creating.html#environmentpath
 [modulepath]: /puppet/3.8/configuration.html#modulepath
 [puppet.conf]: ./config_file_main.html
 [basemodulepath]: /puppet/3.8/configuration.html#basemodulepath

docs/_openvox_8x/config_file_main.markdown

@@ -11,7 +11,7 @@ title: "Config files: The main config file (puppet.conf)"
 [reports]: ./configuration.html#reports
 [modulepath]: ./configuration.html#modulepath
 [ssldir]: ./configuration.html#ssldir
-[dir_environments]: ./environments.html
+[dir_environments]: ./environments_about.html
 [environmentpath]: ./configuration.html#environmentpath
 [puppetserver_diff]: /openvox-server/latest/puppet_conf_setting_diffs.html
 

docs/_openvox_8x/config_important_settings.markdown

@@ -6,7 +6,7 @@ title: "Configuration: Short list of important settings"
 [cli_settings]: ./config_about_settings.html#settings-can-be-set-on-the-command-line
 [trusted_and_facts]: ./lang_facts_and_builtin_vars.html
 [config_reference]: ./configuration.html
-[environments]: ./environments.html
+[environments]: ./environments_about.html
 [multi_master]: /guides/scaling_multiple_masters.html
 [enc]: ./nodes_external.html
 [meta_noop]: ./metaparameter.html#noop

docs/_openvox_8x/config_print.markdown

@@ -7,7 +7,7 @@ title: "Configuration: Checking values of settings"
 [config_sections]: ./config_file_main.html#config-sections
 [setting_sources]: ./config_about_settings.html
 [confdir_sys]: ./dirs_confdir.html#location
-[environment]: ./environments.html
+[environment]: ./environments_about.html
 [confdir]: ./dirs_confdir.html
 [vardir]: ./dirs_vardir.html
 [modulepath]: ./dirs_modulepath.html

docs/_openvox_8x/config_set.markdown

@@ -5,7 +5,7 @@ title: "Configuration: Editing settings on the command line"
 
 [config_sections]: ./config_file_main.html#config-sections
 [puppet.conf]: ./config_file_main.html
-[environments]: ./environments.html
+[environments]: ./environments_about.html
 [confdir_sys]: ./dirs_confdir.html#location
 
 Puppet loads most of its settings from [the puppet.conf config file.][puppet.conf] You can edit this file directly, or you can change individual settings with the `puppet config set` command.