You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by gi...@apache.org on 2020/12/26 07:14:12 UTC

[directory-site] branch asf-site updated: Updated site from master (263fec8b895d9a56c4c084e7d9a2463388fe78bd)

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/directory-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 2813a81  Updated site from master (263fec8b895d9a56c4c084e7d9a2463388fe78bd)
2813a81 is described below

commit 2813a818533d4836507866b71ff43b82bbe8ab35
Author: jenkins <bu...@apache.org>
AuthorDate: Sat Dec 26 07:14:05 2020 +0000

    Updated site from master (263fec8b895d9a56c4c084e7d9a2463388fe78bd)
---
 content/apacheds.html                              |  4 +-
 content/apacheds/advanced-ug/0-community.html      |  4 +-
 .../apacheds/advanced-ug/0.1-reporting-bugs.html   |  4 +-
 .../apacheds/advanced-ug/0.2-building-trunks.html  |  4 +-
 content/apacheds/advanced-ug/0.3-contributing.html |  4 +-
 content/apacheds/advanced-ug/1-architecture.html   |  4 +-
 .../advanced-ug/1.1-architecture-overview.html     |  4 +-
 content/apacheds/advanced-ug/1.2-network.html      |  4 +-
 .../advanced-ug/1.3-directory-service.html         |  4 +-
 content/apacheds/advanced-ug/1.4-interceptors.html |  4 +-
 content/apacheds/advanced-ug/1.5-backend.html      |  4 +-
 content/apacheds/advanced-ug/2-server-config.html  |  4 +-
 .../advanced-ug/2.1-config-description.html        |  4 +-
 .../apacheds/advanced-ug/2.2-instance-layout.html  |  4 +-
 .../advanced-ug/2.2.1-debian-instance-layout.html  |  4 +-
 .../advanced-ug/2.2.2-rpm-instance-layout.html     |  4 +-
 .../advanced-ug/2.2.3-macosx-instance-layout.html  |  4 +-
 .../advanced-ug/2.2.4-windows-instance-layout.html |  4 +-
 .../advanced-ug/2.2.5-generic-instance-layout.html |  4 +-
 content/apacheds/advanced-ug/3-admin-model.html    |  4 +-
 .../advanced-ug/3.1-administrative-points.html     |  4 +-
 .../3.2-operations-on-an-administrativepoint.html  |  4 +-
 .../4-authentication-and-authorization.html        |  4 +-
 .../apacheds/advanced-ug/4.1-authentication.html   |  4 +-
 .../apacheds/advanced-ug/4.1.1-simple-authn.html   |  4 +-
 .../advanced-ug/4.1.1.1-anonymous-authn.html       |  4 +-
 .../advanced-ug/4.1.1.2-name-password-authn.html   |  4 +-
 .../advanced-ug/4.1.1.3-unauthenticated-authn.html |  4 +-
 content/apacheds/advanced-ug/4.1.2-sasl-authn.html |  4 +-
 .../advanced-ug/4.1.2.1-sasl-plain-text-authn.html |  4 +-
 .../advanced-ug/4.1.2.2-sasl-cram-md5-authn.html   |  4 +-
 .../advanced-ug/4.1.2.3-sasl-digest-md5-authn.html |  4 +-
 .../advanced-ug/4.1.2.4-sasl-gssapi-authn.html     |  4 +-
 .../advanced-ug/4.1.2.5-sasl-external-authn.html   |  4 +-
 .../advanced-ug/4.1.2.6-sasl-ntlm-authn.html       |  4 +-
 .../apacheds/advanced-ug/4.1.3-kerberos-authn.html |  4 +-
 .../advanced-ug/4.1.4-certificate-authn.html       |  4 +-
 .../apacheds/advanced-ug/4.2-authorization.html    |  4 +-
 .../apacheds/advanced-ug/4.2.1-introduction.html   |  4 +-
 .../apacheds/advanced-ug/4.2.10-aci-grammar.html   |  4 +-
 .../advanced-ug/4.2.11-links-and-references.html   |  4 +-
 .../apacheds/advanced-ug/4.2.2-definitions.html    |  4 +-
 .../advanced-ug/4.2.3-enabling-access-control.html |  4 +-
 content/apacheds/advanced-ug/4.2.4-aci-types.html  |  4 +-
 content/apacheds/advanced-ug/4.2.4.1-entryaci.html |  4 +-
 .../advanced-ug/4.2.4.2-prescriptiveaci.html       |  4 +-
 .../apacheds/advanced-ug/4.2.4.3-subentryaci.html  |  4 +-
 .../apacheds/advanced-ug/4.2.5-aci-elements.html   |  4 +-
 .../apacheds/advanced-ug/4.2.5.1-userclasses.html  |  4 +-
 .../advanced-ug/4.2.5.2-protecteditems.html        |  4 +-
 .../apacheds/advanced-ug/4.2.5.3-permissions.html  |  4 +-
 content/apacheds/advanced-ug/4.2.5.4-subtrees.html |  4 +-
 .../advanced-ug/4.2.6-the-acdf-engine.html         |  4 +-
 .../apacheds/advanced-ug/4.2.6.1-how-it-works.html |  4 +-
 .../apacheds/advanced-ug/4.2.6.2-selections.html   |  4 +-
 .../apacheds/advanced-ug/4.2.6.3-constraints.html  |  4 +-
 content/apacheds/advanced-ug/4.2.6.4-priority.html |  4 +-
 .../advanced-ug/4.2.7-using-acis-trail.html        |  4 +-
 ...enticated-users-to-browse-and-read-entries.html |  4 +-
 .../4.2.7.2-allow-self-password-modify.html        |  4 +-
 .../advanced-ug/4.2.8-acis-administration.html     |  4 +-
 .../4.2.9-migration-from-other-ldap-servers.html   |  4 +-
 .../apacheds/advanced-ug/4.3-password-policy.html  |  4 +-
 content/apacheds/advanced-ug/5-administration.html |  4 +-
 content/apacheds/advanced-ug/5.1-layout.html       |  4 +-
 content/apacheds/advanced-ug/5.2-start-stop.html   |  4 +-
 content/apacheds/advanced-ug/5.3-logs.html         |  4 +-
 content/apacheds/advanced-ug/5.4-replication.html  |  4 +-
 content/apacheds/advanced-ug/5.5-cache.html        |  4 +-
 .../advanced-ug/6-implementing-interceptor.html    |  4 +-
 .../apacheds/advanced-ug/7-embedding-apacheds.html |  4 +-
 .../advanced-ug/8-operational-attributes.html      |  4 +-
 .../apacheds/advanced-ug/9-apacheds-internals.html |  4 +-
 content/apacheds/advanced-user-guide.html          |  4 +-
 content/apacheds/basic-ug/1-how-to-begin.html      |  4 +-
 .../apacheds/basic-ug/1.1-what-apacheds-is.html    |  4 +-
 content/apacheds/basic-ug/1.2-some-background.html |  6 ++-
 .../basic-ug/1.3-installing-and-starting.html      |  4 +-
 .../basic-ug/1.4-basic-configuration-tasks.html    |  4 +-
 .../basic-ug/1.4.1-changing-server-port.html       |  4 +-
 .../basic-ug/1.4.2-changing-admin-password.html    |  4 +-
 .../apacheds/basic-ug/1.4.3-adding-partition.html  |  4 +-
 .../apacheds/basic-ug/1.4.4-configure-logging.html |  4 +-
 .../apacheds/basic-ug/1.4.5-anonymous-access.html  |  4 +-
 .../basic-ug/1.5-sample-configuration.html         |  4 +-
 content/apacheds/basic-ug/1.6-backup-restore.html  |  4 +-
 content/apacheds/basic-ug/2-handling-data.html     |  4 +-
 .../apacheds/basic-ug/2.1-data-modification.html   |  4 +-
 .../apacheds/basic-ug/2.1.1-adding-entries.html    |  4 +-
 .../apacheds/basic-ug/2.1.2-deleting-entries.html  |  4 +-
 content/apacheds/basic-ug/2.2-searching-data.html  |  4 +-
 content/apacheds/basic-ug/2.2.1-simple-search.html |  4 +-
 .../basic-ug/2.2.2-more-search-options.html        |  4 +-
 .../apacheds/basic-ug/2.3-introducing-schema.html  |  4 +-
 .../basic-ug/2.3.1-adding-schema-elements.html     |  4 +-
 .../apacheds/basic-ug/2.3.2-enabling-schema.html   |  4 +-
 content/apacheds/basic-ug/3-basic-security.html    |  4 +-
 .../basic-ug/3.1-authentication-options.html       |  4 +-
 .../apacheds/basic-ug/3.2-basic-authorization.html |  4 +-
 content/apacheds/basic-ug/3.3-enabling-ssl.html    |  4 +-
 .../apacheds/basic-ug/4-integrating-apacheds.html  |  4 +-
 .../apacheds/basic-ug/4.1-mozilla-thunderbird.html |  6 ++-
 content/apacheds/basic-user-guide.html             |  4 +-
 content/apacheds/coding-standards.html             |  4 +-
 .../configuration/ads-2.0-configuration.html       |  4 +-
 content/apacheds/configuration/adsconfig.html      |  4 +-
 content/apacheds/developer-guide.html              |  4 +-
 content/apacheds/download-old-versions.html        |  4 +-
 content/apacheds/download/download-archive.html    |  4 +-
 content/apacheds/download/download-linux-bin.html  |  4 +-
 content/apacheds/download/download-linux-deb.html  |  4 +-
 content/apacheds/download/download-linux-rpm.html  |  4 +-
 content/apacheds/download/download-macosx.html     |  4 +-
 content/apacheds/download/download-sources.html    |  4 +-
 content/apacheds/download/download-windows.html    |  4 +-
 content/apacheds/downloads.html                    |  4 +-
 content/apacheds/features.html                     |  4 +-
 content/apacheds/index.html                        |  4 +-
 .../internal-design-guide.html                     |  4 +-
 content/apacheds/kerberos-ug/1-kerberos.html       |  4 +-
 content/apacheds/kerberos-ug/1.1-introduction.html |  4 +-
 content/apacheds/kerberos-ug/1.1.1-realms.html     |  4 +-
 content/apacheds/kerberos-ug/1.1.2-principals.html |  4 +-
 content/apacheds/kerberos-ug/1.1.3-keys.html       |  4 +-
 content/apacheds/kerberos-ug/1.1.4-kdc.html        |  4 +-
 content/apacheds/kerberos-ug/1.1.5-database.html   |  4 +-
 content/apacheds/kerberos-ug/1.1.6-as.html         |  4 +-
 content/apacheds/kerberos-ug/1.1.7-tgs.html        |  4 +-
 content/apacheds/kerberos-ug/1.1.8-tickets.html    |  4 +-
 content/apacheds/kerberos-ug/1.2-resources.html    |  4 +-
 .../kerberos-ug/1.2.1-kerberos-articles.html       |  4 +-
 .../kerberos-ug/1.2.2-microsoft-compatibility.html |  4 +-
 content/apacheds/kerberos-ug/1.2.3-standards.html  |  4 +-
 .../apacheds/kerberos-ug/2-kerberos-config.html    |  4 +-
 content/apacheds/kerberos-ug/2.1-installing.html   |  4 +-
 .../kerberos-ug/2.2-ldap-server-config.html        |  4 +-
 .../kerberos-ug/2.3-kerberos-server-config.html    |  4 +-
 content/apacheds/kerberos-ug/2.4-kerberos-ulp.html |  4 +-
 content/apacheds/kerberos-ug/2.5-pkinit.html       |  4 +-
 content/apacheds/kerberos-ug/2.6-cross-realm.html  |  4 +-
 content/apacheds/kerberos-ug/3-kerberos-admin.html |  4 +-
 content/apacheds/kerberos-ug/3.1-start-stop.html   |  4 +-
 .../kerberos-ug/3.2-managing-clients-services.html |  4 +-
 .../apacheds/kerberos-ug/3.3-change-password.html  |  4 +-
 content/apacheds/kerberos-ug/3.4-logs.html         |  4 +-
 content/apacheds/kerberos-ug/3.5-replication.html  |  4 +-
 .../apacheds/kerberos-ug/3.6-backup-restore.html   |  4 +-
 content/apacheds/kerberos-ug/4-using-kerberos.html |  4 +-
 .../kerberos-ug/4.1-authenticate-kinit.html        |  4 +-
 .../kerberos-ug/4.2-authenticate-studio.html       |  4 +-
 .../apacheds/kerberos-ug/5-interoperability.html   |  4 +-
 content/apacheds/kerberos-ug/6-glossary.html       |  4 +-
 content/apacheds/kerberos-user-guide.html          |  4 +-
 content/apacheds/news.html                         |  4 +-
 content/api.html                                   |  4 +-
 content/api/coding-standards.html                  |  4 +-
 content/api/developer-guide.html                   |  4 +-
 content/api/download-old-versions.html             |  4 +-
 content/api/download/download-archive-1.html       |  4 +-
 content/api/download/download-archive-2.html       |  4 +-
 content/api/download/download-sources-1.html       |  4 +-
 content/api/download/download-sources-2.html       |  4 +-
 content/api/downloads-1.html                       |  4 +-
 content/api/downloads-2.html                       |  4 +-
 content/api/five-minutes-tutorial.html             |  4 +-
 content/api/index.html                             |  4 +-
 content/api/internal-design-guide.html             |  4 +-
 .../api/internal-design-guide/1-introduction.html  |  4 +-
 content/api/internal-design-guide/10-entry.html    |  4 +-
 content/api/internal-design-guide/11-filter.html   |  4 +-
 content/api/internal-design-guide/12-cursor.html   |  4 +-
 content/api/internal-design-guide/13-controls.html |  4 +-
 .../14-extended-operations.html                    |  4 +-
 content/api/internal-design-guide/15-ldif.html     |  4 +-
 content/api/internal-design-guide/16-dsml.html     |  4 +-
 content/api/internal-design-guide/17-osgi.html     |  4 +-
 .../internal-design-guide/2-general-structure.html |  4 +-
 content/api/internal-design-guide/3-building.html  |  4 +-
 content/api/internal-design-guide/4-asn1.html      |  4 +-
 .../api/internal-design-guide/4.1-asn1-tlv.html    |  4 +-
 content/api/internal-design-guide/5-network.html   |  4 +-
 content/api/internal-design-guide/6-codec.html     |  4 +-
 .../api/internal-design-guide/7-ldap-messages.html |  4 +-
 content/api/internal-design-guide/8-schema.html    |  4 +-
 content/api/internal-design-guide/9-dn.html        |  4 +-
 content/api/java-api.html                          |  4 +-
 content/api/migration-guide.html                   |  4 +-
 content/api/news.html                              |  4 +-
 content/api/user-guide.html                        |  6 ++-
 content/api/user-guide/1-introduction.html         |  4 +-
 content/api/user-guide/1.1-java-and-ldap.html      |  4 +-
 .../api/user-guide/1.2-ldap-in-a-few-words.html    |  4 +-
 .../user-guide/1.3-apache-ldap-api-rational.html   |  4 +-
 .../api/user-guide/1.4-preparation-to-code.html    |  4 +-
 content/api/user-guide/2-basic-ldap-api-usage.html |  4 +-
 .../user-guide/2.1-connection-disconnection.html   |  4 +-
 .../user-guide/2.10-ldap-connection-template.html  |  4 +-
 content/api/user-guide/2.11-filter-builder.html    |  4 +-
 content/api/user-guide/2.2-binding-unbinding.html  |  4 +-
 content/api/user-guide/2.3-searching.html          |  4 +-
 content/api/user-guide/2.4-adding.html             |  4 +-
 content/api/user-guide/2.5-deleting.html           |  4 +-
 content/api/user-guide/2.6-modifying.html          |  4 +-
 content/api/user-guide/2.7-moving-renaming.html    |  4 +-
 content/api/user-guide/2.8-comparing.html          |  4 +-
 .../api/user-guide/2.9-exception-management.html   |  4 +-
 .../api/user-guide/3-advanced-ldap-api-usage.html  |  4 +-
 content/api/user-guide/3.1-controls.html           |  4 +-
 .../api/user-guide/3.2-extended-operations.html    |  4 +-
 content/api/user-guide/3.3-referrals.html          |  4 +-
 content/api/user-guide/3.4-aliases.html            |  4 +-
 content/api/user-guide/3.5-ldif-dsml.html          |  4 +-
 content/api/user-guide/3.6-abandonning.html        |  4 +-
 .../api/user-guide/3.7-server-informations.html    |  4 +-
 content/api/user-guide/4-schema-management.html    |  4 +-
 content/api/user-guide/4.1-schema.html             |  4 +-
 content/api/user-guide/4.2-schema-manager.html     |  4 +-
 content/api/user-guide/4.2.1-schema-objects.html   |  4 +-
 .../api/user-guide/4.2.1.1-attribute-types.html    |  4 +-
 content/api/user-guide/4.2.1.2-object-classes.html |  4 +-
 content/api/user-guide/4.2.1.3-syntaxes.html       |  4 +-
 content/api/user-guide/4.2.1.4-matching-rules.html |  4 +-
 .../api/user-guide/4.2.1.5-dit-content-rules.html  |  4 +-
 .../user-guide/4.2.1.6-dit-structure-rules.html    |  4 +-
 .../api/user-guide/4.2.1.7-matching-rule-uses.html |  4 +-
 content/api/user-guide/4.2.1.8-name-forms.html     |  4 +-
 .../4.2.1.9-apacheds-schema-elements.html          |  4 +-
 content/api/user-guide/4.2.2-registries.html       |  4 +-
 content/api/user-guide/4.2.3-schema-loader.html    |  4 +-
 content/api/user-guide/5-ldap-security.html        |  4 +-
 content/api/user-guide/5.1-ldaps.html              |  4 +-
 content/api/user-guide/5.2-start-tls.html          |  4 +-
 content/api/user-guide/5.3-sasl-bind.html          |  4 +-
 content/api/user-guide/5.4-password-handling.html  |  4 +-
 content/api/user-guide/5.5-certificates.html       |  4 +-
 content/api/user-guide/5.6-aci-and-acls.html       |  4 +-
 content/api/user-guide/6-ldap-data-structures.html |  4 +-
 .../api/user-guide/6.1-administrative-point.html   |  4 +-
 content/api/user-guide/6.10-dit-content-rule.html  |  4 +-
 .../api/user-guide/6.11-dit-structure-rule.html    |  4 +-
 content/api/user-guide/6.12-entry.html             |  4 +-
 content/api/user-guide/6.13-expr-node.html         |  4 +-
 content/api/user-guide/6.14-ldap-comparator.html   |  4 +-
 content/api/user-guide/6.15-ldap-result.html       |  4 +-
 content/api/user-guide/6.16-ldap-syntax.html       |  4 +-
 content/api/user-guide/6.17-ldap-url.html          |  4 +-
 content/api/user-guide/6.18-ldif-control.html      |  4 +-
 content/api/user-guide/6.19-ldif-entry.html        |  4 +-
 .../api/user-guide/6.2-administrative-role.html    |  4 +-
 content/api/user-guide/6.20-matching-rule.html     |  4 +-
 content/api/user-guide/6.21-matching-rule-use.html |  4 +-
 content/api/user-guide/6.22-message.html           |  4 +-
 content/api/user-guide/6.23-modification.html      |  4 +-
 content/api/user-guide/6.24-name-form.html         |  4 +-
 content/api/user-guide/6.25-normalizer.html        |  4 +-
 content/api/user-guide/6.26-object-class.html      |  4 +-
 content/api/user-guide/6.27-oid.html               |  4 +-
 content/api/user-guide/6.28-rdn.html               |  4 +-
 content/api/user-guide/6.29-referral.html          |  4 +-
 content/api/user-guide/6.3-attribute.html          |  4 +-
 content/api/user-guide/6.30-refinment.html         |  4 +-
 content/api/user-guide/6.31-schema-manager.html    |  4 +-
 content/api/user-guide/6.32-subentry.html          |  4 +-
 .../api/user-guide/6.33-subtree-specification.html |  4 +-
 content/api/user-guide/6.34-syntax-checker.html    |  4 +-
 content/api/user-guide/6.35-value.html             |  4 +-
 content/api/user-guide/6.4-attribute-type.html     |  4 +-
 content/api/user-guide/6.5-ava.html                |  4 +-
 content/api/user-guide/6.6-csn.html                |  4 +-
 content/api/user-guide/6.7-control.html            |  4 +-
 content/api/user-guide/6.8-cursor.html             |  4 +-
 content/api/user-guide/6.9-dn.html                 |  4 +-
 content/api/user-guide/7-requests-responses.html   |  4 +-
 content/api/user-guide/7.1-abandon-request.html    |  4 +-
 content/api/user-guide/7.10-extended-request.html  |  4 +-
 content/api/user-guide/7.11-extended-response.html |  4 +-
 .../api/user-guide/7.12-intermediate-response.html |  4 +-
 content/api/user-guide/7.13-mod-dn-request.html    |  4 +-
 content/api/user-guide/7.14-mod-dn-response.html   |  4 +-
 content/api/user-guide/7.15-modify-request.html    |  4 +-
 content/api/user-guide/7.16-modify-response.html   |  4 +-
 content/api/user-guide/7.17-search-request.html    |  4 +-
 .../api/user-guide/7.18-search-result-done.html    |  4 +-
 .../api/user-guide/7.19-search-result-entry.html   |  4 +-
 content/api/user-guide/7.2-add-request.html        |  4 +-
 .../user-guide/7.20-search-result-reference.html   |  4 +-
 content/api/user-guide/7.21-unbind-request.html    |  4 +-
 content/api/user-guide/7.3-add-response.html       |  4 +-
 content/api/user-guide/7.4-bind-request.html       |  4 +-
 content/api/user-guide/7.5-bind-response.html      |  4 +-
 content/api/user-guide/7.6-compare-request.html    |  4 +-
 content/api/user-guide/7.7-compare-response.html   |  4 +-
 content/api/user-guide/7.8-del-request.html        |  4 +-
 content/api/user-guide/7.9-del-response.html       |  4 +-
 content/api/user-guide/8-ldap-rfcs.html            |  4 +-
 content/api/vision.html                            |  4 +-
 content/articles.html                              |  4 +-
 content/commercial-support.html                    |  4 +-
 content/conference-materials.html                  |  4 +-
 content/contribute.html                            |  4 +-
 content/fortress.html                              |  4 +-
 content/fortress/coding-standards.html             |  4 +-
 content/fortress/developer-guide.html              |  4 +-
 content/fortress/download-old-versions.html        |  4 +-
 content/fortress/download/download-archive.html    |  4 +-
 content/fortress/download/download-sources.html    |  4 +-
 content/fortress/downloads.html                    |  4 +-
 content/fortress/history.html                      |  4 +-
 content/fortress/index.html                        |  4 +-
 content/fortress/installation.html                 |  4 +-
 content/fortress/installation/apacheds.html        |  4 +-
 .../fortress/installation/apacheds/apacheds.html   |  4 +-
 .../fortress/installation/apacheds/guidelines.html |  4 +-
 .../installation/apacheds/prerequisites.html       |  4 +-
 .../fortress/installation/apacheds/section-I.html  |  4 +-
 .../fortress/installation/apacheds/section-II.html |  4 +-
 .../installation/apacheds/section-III.html         |  4 +-
 .../fortress/installation/apacheds/section-IV.html |  4 +-
 .../fortress/installation/apacheds/section-IX.html |  4 +-
 .../fortress/installation/apacheds/section-V.html  |  4 +-
 .../fortress/installation/apacheds/section-VI.html |  4 +-
 .../installation/apacheds/section-VII.html         |  4 +-
 .../installation/apacheds/section-VIII.html        |  4 +-
 .../fortress/installation/apacheds/section-X.html  |  4 +-
 .../fortress/installation/linux/guidelines.html    |  4 +-
 content/fortress/installation/linux/linux.html     |  4 +-
 .../fortress/installation/linux/prerequisites.html |  4 +-
 content/fortress/installation/linux/section-I.html |  4 +-
 .../fortress/installation/linux/section-II.html    |  4 +-
 .../fortress/installation/linux/section-III.html   |  4 +-
 .../fortress/installation/linux/section-IV.html    |  4 +-
 .../fortress/installation/linux/section-IX.html    |  4 +-
 content/fortress/installation/linux/section-V.html |  4 +-
 .../fortress/installation/linux/section-VI.html    |  4 +-
 .../fortress/installation/linux/section-VII.html   |  4 +-
 .../fortress/installation/linux/section-VIII.html  |  4 +-
 content/fortress/installation/linux/section-X.html |  4 +-
 .../fortress/installation/linux/section-XI.html    |  4 +-
 .../fortress/installation/linux/section-XII.html   |  4 +-
 .../fortress/installation/linux/section-XIII.html  |  4 +-
 .../fortress/installation/linux/section-XIV.html   |  4 +-
 content/fortress/installation/openldap.html        |  4 +-
 .../fortress/installation/windows/guidelines.html  |  4 +-
 .../fortress/installation/windows/prequesites.html |  4 +-
 .../fortress/installation/windows/section-I.html   |  4 +-
 .../fortress/installation/windows/section-II.html  |  4 +-
 .../fortress/installation/windows/section-III.html |  4 +-
 .../fortress/installation/windows/section-IV.html  |  4 +-
 .../fortress/installation/windows/section-IX.html  |  4 +-
 .../fortress/installation/windows/section-V.html   |  4 +-
 .../fortress/installation/windows/section-VI.html  |  4 +-
 .../fortress/installation/windows/section-VII.html |  4 +-
 .../installation/windows/section-VIII.html         |  4 +-
 .../fortress/installation/windows/section-X.html   |  4 +-
 .../fortress/installation/windows/section-XI.html  |  4 +-
 .../fortress/installation/windows/section-XII.html |  4 +-
 .../installation/windows/section-XIII.html         |  4 +-
 content/fortress/installation/windows/windows.html |  4 +-
 content/fortress/issues.html                       |  4 +-
 content/fortress/news.html                         |  4 +-
 content/fortress/overview.html                     |  4 +-
 content/fortress/testimonials.html                 |  4 +-
 content/fortress/user-guide.html                   |  4 +-
 content/fortress/user-guide/1-intro-rbac.html      |  4 +-
 .../fortress/user-guide/1.1-rbac-explained.html    |  4 +-
 .../fortress/user-guide/1.2-what-is-not-rbac.html  |  4 +-
 content/fortress/user-guide/1.3-what-rbac-is.html  |  4 +-
 .../user-guide/1.4-why-rbac-is-important.html      |  4 +-
 .../fortress/user-guide/1.5-how-to-impl-rbac.html  |  4 +-
 content/fortress/user-guide/1.6-go-for-more.html   |  4 +-
 content/fortress/user-guide/2-multitenancy.html    |  4 +-
 .../user-guide/2.1-fortress-multitenancy.html      |  4 +-
 .../user-guide/2.2-tradi-multi-instances.html      |  4 +-
 .../user-guide/2.3-multitenancy-under-covers.html  |  4 +-
 content/fortress/user-guide/3-configuration.html   |  4 +-
 content/fortress/vision.html                       |  4 +-
 content/index.html                                 |  4 +-
 content/index.xml                                  |  4 +-
 content/issue-tracking.html                        |  4 +-
 content/kerby.html                                 |  4 +-
 content/kerby/developer-guide.html                 |  4 +-
 content/kerby/download-old-versions.html           |  4 +-
 content/kerby/download/download-archive.html       |  4 +-
 content/kerby/download/download-sources.html       |  4 +-
 content/kerby/downloads.html                       |  4 +-
 content/kerby/features.html                        |  4 +-
 content/kerby/index.html                           |  4 +-
 content/kerby/issues.html                          |  4 +-
 content/kerby/kerby-asn1.html                      |  4 +-
 content/kerby/news.html                            |  4 +-
 content/kerby/overview.html                        |  4 +-
 content/kerby/tutorials.html                       |  4 +-
 content/kerby/user-guide.html                      |  4 +-
 content/kerby/user-guide/1-how-to-begin.html       |  4 +-
 content/kerby/user-guide/2-kerberos-library.html   |  4 +-
 content/kerby/user-guide/2.1-krbclient-apis.html   |  4 +-
 content/kerby/user-guide/2.2-kadmin.html           |  4 +-
 content/kerby/user-guide/2.3-kdcserver.html        |  4 +-
 content/kerby/user-guide/2.4-simplekdcserver.html  |  4 +-
 content/kerby/user-guide/3-tools.html              |  4 +-
 content/kerby/user-guide/3.1-kdcinit.html          |  4 +-
 content/kerby/user-guide/3.2-kadmin.html           |  4 +-
 content/kerby/user-guide/3.3-kinit.html            |  4 +-
 content/kerby/user-guide/3.4-klist.html            |  4 +-
 content/kerby/user-guide/4-identity-backend.html   |  4 +-
 .../user-guide/5-crypto-and-encryption-types.html  |  4 +-
 content/kerby/user-guide/6-network-support.html    |  4 +-
 content/kerby/user-guide/7-dependency.html         |  4 +-
 content/kerby/vision.html                          |  4 +-
 content/mailing-lists-and-irc.html                 |  4 +-
 content/mavibot.html                               |  4 +-
 content/mavibot/coding-standards.html              |  4 +-
 content/mavibot/developer-guide.html               |  4 +-
 content/mavibot/download-old-versions.html         |  4 +-
 content/mavibot/download/download-archive.html     |  4 +-
 content/mavibot/download/download-sources.html     |  4 +-
 content/mavibot/downloads.html                     |  4 +-
 content/mavibot/five-minutes-tutorial.html         |  4 +-
 content/mavibot/index.html                         |  4 +-
 content/mavibot/news.html                          |  4 +-
 content/mavibot/user-guide.html                    |  4 +-
 content/mavibot/user-guide/1-introduction.html     |  4 +-
 content/mavibot/user-guide/1.1-btree-basics.html   |  4 +-
 content/mavibot/user-guide/2-btree-types.html      |  4 +-
 content/mavibot/user-guide/2.1-mvcc-btree.html     |  4 +-
 content/mavibot/user-guide/3-btree-management.html |  4 +-
 content/mavibot/user-guide/4-btree-operations.html |  4 +-
 .../mavibot/user-guide/5-btree-informations.html   |  4 +-
 .../mavibot/user-guide/6-btree-configuration.html  |  4 +-
 content/mavibot/user-guide/7-btree-internals.html  |  4 +-
 .../mavibot/user-guide/7.1-logical-structure.html  |  4 +-
 .../mavibot/user-guide/7.2-physical-storage.html   |  4 +-
 content/mavibot/user-guide/7.3-serializations.html |  4 +-
 content/mavibot/user-guide/7.4-updates.html        |  4 +-
 content/mavibot/vision.html                        |  4 +-
 content/original-project-proposal.html             |  4 +-
 content/privacy-policy.html                        |  4 +-
 content/references.html                            |  4 +-
 content/scimple.html                               |  4 +-
 content/scimple/index.html                         |  4 +-
 content/scimple/news.html                          |  4 +-
 content/security-advisories.html                   |  4 +-
 content/sitemap.xml                                | 16 +++----
 content/sources.html                               |  4 +-
 content/special-thanks.html                        |  4 +-
 content/studio.html                                |  4 +-
 content/studio/changelog.html                      | 55 +++++++++++++++++++++-
 content/studio/developers-guide.html               |  4 +-
 .../developers-howtos/developers-howtos.html       |  4 +-
 .../developers-howtos/howtos/table-widget.html     |  4 +-
 content/studio/download-old-versions.html          |  4 +-
 content/studio/download/download-linux.html        |  4 +-
 content/studio/download/download-macosx.html       |  4 +-
 content/studio/download/download-sources.html      |  4 +-
 content/studio/download/download-windows.html      |  4 +-
 content/studio/downloads.html                      |  4 +-
 content/studio/faqs.html                           |  4 +-
 content/studio/index.html                          | 10 +++-
 content/studio/index.xml                           |  4 +-
 content/studio/installation-in-eclipse.html        |  4 +-
 content/studio/internationalization.html           |  4 +-
 content/studio/news.html                           | 10 +++-
 content/studio/screenshots.html                    |  4 +-
 content/studio/source-repository.html              |  4 +-
 content/studio/testimonials.html                   |  4 +-
 content/studio/update/index.html                   |  4 +-
 content/studio/update/product/index.html           |  4 +-
 content/studio/users-guide.html                    |  4 +-
 content/team.html                                  |  4 +-
 content/testimonies.html                           |  4 +-
 content/vision.html                                |  4 +-
 471 files changed, 1482 insertions(+), 483 deletions(-)

diff --git a/content/apacheds.html b/content/apacheds.html
index 041044d..491f902 100644
--- a/content/apacheds.html
+++ b/content/apacheds.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Apacheds &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/0-community.html b/content/apacheds/advanced-ug/0-community.html
index 89c6d0f..2bdbb77 100644
--- a/content/apacheds/advanced-ug/0-community.html
+++ b/content/apacheds/advanced-ug/0-community.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>0 - Community &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/0.1-reporting-bugs.html b/content/apacheds/advanced-ug/0.1-reporting-bugs.html
index ad6fe95..824285e 100644
--- a/content/apacheds/advanced-ug/0.1-reporting-bugs.html
+++ b/content/apacheds/advanced-ug/0.1-reporting-bugs.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>0.1 - Reporting Bugs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/0.2-building-trunks.html b/content/apacheds/advanced-ug/0.2-building-trunks.html
index b16d64a..bcc89b8 100644
--- a/content/apacheds/advanced-ug/0.2-building-trunks.html
+++ b/content/apacheds/advanced-ug/0.2-building-trunks.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>0.2 - Building Trunks &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/0.3-contributing.html b/content/apacheds/advanced-ug/0.3-contributing.html
index 2ce8ba7..1152f0a 100644
--- a/content/apacheds/advanced-ug/0.3-contributing.html
+++ b/content/apacheds/advanced-ug/0.3-contributing.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>0.3 - Contributing &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1-architecture.html b/content/apacheds/advanced-ug/1-architecture.html
index 5ed1043..32363b6 100644
--- a/content/apacheds/advanced-ug/1-architecture.html
+++ b/content/apacheds/advanced-ug/1-architecture.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - Architecture &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1.1-architecture-overview.html b/content/apacheds/advanced-ug/1.1-architecture-overview.html
index 4f2789e..9510dff 100644
--- a/content/apacheds/advanced-ug/1.1-architecture-overview.html
+++ b/content/apacheds/advanced-ug/1.1-architecture-overview.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - Architecture Overview &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1.2-network.html b/content/apacheds/advanced-ug/1.2-network.html
index 1d992e4..8ad1a62 100644
--- a/content/apacheds/advanced-ug/1.2-network.html
+++ b/content/apacheds/advanced-ug/1.2-network.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2 - Newtork Layer &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1.3-directory-service.html b/content/apacheds/advanced-ug/1.3-directory-service.html
index 45202d9..0cca606 100644
--- a/content/apacheds/advanced-ug/1.3-directory-service.html
+++ b/content/apacheds/advanced-ug/1.3-directory-service.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.3 - DirectoryService &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1.4-interceptors.html b/content/apacheds/advanced-ug/1.4-interceptors.html
index 660beb8..0d1d5e6 100644
--- a/content/apacheds/advanced-ug/1.4-interceptors.html
+++ b/content/apacheds/advanced-ug/1.4-interceptors.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4 - Interceptors &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/1.5-backend.html b/content/apacheds/advanced-ug/1.5-backend.html
index 2c041b8..da2fe56 100644
--- a/content/apacheds/advanced-ug/1.5-backend.html
+++ b/content/apacheds/advanced-ug/1.5-backend.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.5 - Backend &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2-server-config.html b/content/apacheds/advanced-ug/2-server-config.html
index 9e50fa6..98854c5 100644
--- a/content/apacheds/advanced-ug/2-server-config.html
+++ b/content/apacheds/advanced-ug/2-server-config.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Server Configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.1-config-description.html b/content/apacheds/advanced-ug/2.1-config-description.html
index 95db7ec..9d2575a 100644
--- a/content/apacheds/advanced-ug/2.1-config-description.html
+++ b/content/apacheds/advanced-ug/2.1-config-description.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - Configuration Description &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2-instance-layout.html b/content/apacheds/advanced-ug/2.2-instance-layout.html
index 1f1c6f7..c531913 100644
--- a/content/apacheds/advanced-ug/2.2-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2.1-debian-instance-layout.html b/content/apacheds/advanced-ug/2.2.1-debian-instance-layout.html
index fa3681e..002ea4a 100644
--- a/content/apacheds/advanced-ug/2.2.1-debian-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2.1-debian-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.1 - Debian Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2.2-rpm-instance-layout.html b/content/apacheds/advanced-ug/2.2.2-rpm-instance-layout.html
index 6bacb4c..76046fe 100644
--- a/content/apacheds/advanced-ug/2.2.2-rpm-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2.2-rpm-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.2 - RPM Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2.3-macosx-instance-layout.html b/content/apacheds/advanced-ug/2.2.3-macosx-instance-layout.html
index a12f4c6..821c2eb 100644
--- a/content/apacheds/advanced-ug/2.2.3-macosx-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2.3-macosx-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.3 - MacOSX Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2.4-windows-instance-layout.html b/content/apacheds/advanced-ug/2.2.4-windows-instance-layout.html
index 178e9db..a95de30 100644
--- a/content/apacheds/advanced-ug/2.2.4-windows-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2.4-windows-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.4 - Windows Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/2.2.5-generic-instance-layout.html b/content/apacheds/advanced-ug/2.2.5-generic-instance-layout.html
index e5aadb6..fc10c05 100644
--- a/content/apacheds/advanced-ug/2.2.5-generic-instance-layout.html
+++ b/content/apacheds/advanced-ug/2.2.5-generic-instance-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.5 - Generic Instance Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/3-admin-model.html b/content/apacheds/advanced-ug/3-admin-model.html
index f426e7a..fae12ef 100644
--- a/content/apacheds/advanced-ug/3-admin-model.html
+++ b/content/apacheds/advanced-ug/3-admin-model.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Administrative Model &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/3.1-administrative-points.html b/content/apacheds/advanced-ug/3.1-administrative-points.html
index 8507e60..8c626cb 100644
--- a/content/apacheds/advanced-ug/3.1-administrative-points.html
+++ b/content/apacheds/advanced-ug/3.1-administrative-points.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.1. Administrative points &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/3.2-operations-on-an-administrativepoint.html b/content/apacheds/advanced-ug/3.2-operations-on-an-administrativepoint.html
index 3496373..9fa0e80 100644
--- a/content/apacheds/advanced-ug/3.2-operations-on-an-administrativepoint.html
+++ b/content/apacheds/advanced-ug/3.2-operations-on-an-administrativepoint.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.2 Operations on an Administrative Point &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4-authentication-and-authorization.html b/content/apacheds/advanced-ug/4-authentication-and-authorization.html
index a944ed9..4a660ed 100644
--- a/content/apacheds/advanced-ug/4-authentication-and-authorization.html
+++ b/content/apacheds/advanced-ug/4-authentication-and-authorization.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Authentication &amp; Authorization &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1-authentication.html b/content/apacheds/advanced-ug/4.1-authentication.html
index ef6a7cf..4f48b8f 100644
--- a/content/apacheds/advanced-ug/4.1-authentication.html
+++ b/content/apacheds/advanced-ug/4.1-authentication.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1. Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.1-simple-authn.html b/content/apacheds/advanced-ug/4.1.1-simple-authn.html
index 8a40060..ae7a07f 100644
--- a/content/apacheds/advanced-ug/4.1.1-simple-authn.html
+++ b/content/apacheds/advanced-ug/4.1.1-simple-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.1 Simple Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.1.1-anonymous-authn.html b/content/apacheds/advanced-ug/4.1.1.1-anonymous-authn.html
index bde1af6..ec2c015 100644
--- a/content/apacheds/advanced-ug/4.1.1.1-anonymous-authn.html
+++ b/content/apacheds/advanced-ug/4.1.1.1-anonymous-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.1.1 Anonymous Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html b/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html
index b7477fd..7cdbcf3 100644
--- a/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html
+++ b/content/apacheds/advanced-ug/4.1.1.2-name-password-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.1.2 Name/Password Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.1.3-unauthenticated-authn.html b/content/apacheds/advanced-ug/4.1.1.3-unauthenticated-authn.html
index 45cdb30..5d57546 100644
--- a/content/apacheds/advanced-ug/4.1.1.3-unauthenticated-authn.html
+++ b/content/apacheds/advanced-ug/4.1.1.3-unauthenticated-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.1.3 Unauthenticated Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2-sasl-authn.html b/content/apacheds/advanced-ug/4.1.2-sasl-authn.html
index da69965..ccb795c 100644
--- a/content/apacheds/advanced-ug/4.1.2-sasl-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2-sasl-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2 SASL Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.1-sasl-plain-text-authn.html b/content/apacheds/advanced-ug/4.1.2.1-sasl-plain-text-authn.html
index 7e7ba00..84fa805 100644
--- a/content/apacheds/advanced-ug/4.1.2.1-sasl-plain-text-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.1-sasl-plain-text-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.1 SASL PLAIN Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html b/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html
index 34aa894..97b5db7 100644
--- a/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.2-sasl-cram-md5-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.2 - SASL CRAM-MD5 Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html b/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html
index 38631b5..df4ec70 100644
--- a/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.3-sasl-digest-md5-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.3 - SASL DIGEST-MD5 Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html b/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html
index 7312745..18156e4 100644
--- a/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.4-sasl-gssapi-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.4 - SASL GSSAPI Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.5-sasl-external-authn.html b/content/apacheds/advanced-ug/4.1.2.5-sasl-external-authn.html
index 9115c51..8aad1cb 100644
--- a/content/apacheds/advanced-ug/4.1.2.5-sasl-external-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.5-sasl-external-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.5 - SASL EXTERNAL Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.2.6-sasl-ntlm-authn.html b/content/apacheds/advanced-ug/4.1.2.6-sasl-ntlm-authn.html
index 308760b..72ac4fa 100644
--- a/content/apacheds/advanced-ug/4.1.2.6-sasl-ntlm-authn.html
+++ b/content/apacheds/advanced-ug/4.1.2.6-sasl-ntlm-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.2.6 - SASL NTLM Authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html b/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html
index dfa90b3..2f130a4 100644
--- a/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html
+++ b/content/apacheds/advanced-ug/4.1.3-kerberos-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.3 - Kerberos authentication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.1.4-certificate-authn.html b/content/apacheds/advanced-ug/4.1.4-certificate-authn.html
index bf21bce..d16c249 100644
--- a/content/apacheds/advanced-ug/4.1.4-certificate-authn.html
+++ b/content/apacheds/advanced-ug/4.1.4-certificate-authn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1.4 - Client authentication through certificates &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2-authorization.html b/content/apacheds/advanced-ug/4.2-authorization.html
index edb41c3..9759394 100644
--- a/content/apacheds/advanced-ug/4.2-authorization.html
+++ b/content/apacheds/advanced-ug/4.2-authorization.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2 - Authorization &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.1-introduction.html b/content/apacheds/advanced-ug/4.2.1-introduction.html
index 33fba11..6f14fb1 100644
--- a/content/apacheds/advanced-ug/4.2.1-introduction.html
+++ b/content/apacheds/advanced-ug/4.2.1-introduction.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1 - Introduction &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.10-aci-grammar.html b/content/apacheds/advanced-ug/4.2.10-aci-grammar.html
index 5f008f4..b788814 100644
--- a/content/apacheds/advanced-ug/4.2.10-aci-grammar.html
+++ b/content/apacheds/advanced-ug/4.2.10-aci-grammar.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.10 - ACI grammar &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.11-links-and-references.html b/content/apacheds/advanced-ug/4.2.11-links-and-references.html
index 9a53a6e..fbbc1d7 100644
--- a/content/apacheds/advanced-ug/4.2.11-links-and-references.html
+++ b/content/apacheds/advanced-ug/4.2.11-links-and-references.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.11 - Links and References &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.2-definitions.html b/content/apacheds/advanced-ug/4.2.2-definitions.html
index 7253a7f..74a3ae1 100644
--- a/content/apacheds/advanced-ug/4.2.2-definitions.html
+++ b/content/apacheds/advanced-ug/4.2.2-definitions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.2 - Definitions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.3-enabling-access-control.html b/content/apacheds/advanced-ug/4.2.3-enabling-access-control.html
index 68a562f..c6b3ae5 100644
--- a/content/apacheds/advanced-ug/4.2.3-enabling-access-control.html
+++ b/content/apacheds/advanced-ug/4.2.3-enabling-access-control.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.3 - Enabling Access Control &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.4-aci-types.html b/content/apacheds/advanced-ug/4.2.4-aci-types.html
index 2f5832d..c7f9335 100644
--- a/content/apacheds/advanced-ug/4.2.4-aci-types.html
+++ b/content/apacheds/advanced-ug/4.2.4-aci-types.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.4 - ACI types &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.4.1-entryaci.html b/content/apacheds/advanced-ug/4.2.4.1-entryaci.html
index f406a24..16b5bcb 100644
--- a/content/apacheds/advanced-ug/4.2.4.1-entryaci.html
+++ b/content/apacheds/advanced-ug/4.2.4.1-entryaci.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.4.1 - EntryACI &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.4.2-prescriptiveaci.html b/content/apacheds/advanced-ug/4.2.4.2-prescriptiveaci.html
index 57fc236..c47f5b7 100644
--- a/content/apacheds/advanced-ug/4.2.4.2-prescriptiveaci.html
+++ b/content/apacheds/advanced-ug/4.2.4.2-prescriptiveaci.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.4.2 - PrescriptiveACI &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.4.3-subentryaci.html b/content/apacheds/advanced-ug/4.2.4.3-subentryaci.html
index be01427..c2ca75a 100644
--- a/content/apacheds/advanced-ug/4.2.4.3-subentryaci.html
+++ b/content/apacheds/advanced-ug/4.2.4.3-subentryaci.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.4.3 - SubentryACI &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.5-aci-elements.html b/content/apacheds/advanced-ug/4.2.5-aci-elements.html
index 73516a7..7003c29 100644
--- a/content/apacheds/advanced-ug/4.2.5-aci-elements.html
+++ b/content/apacheds/advanced-ug/4.2.5-aci-elements.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.5 - ACI elements &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.5.1-userclasses.html b/content/apacheds/advanced-ug/4.2.5.1-userclasses.html
index 785895f..cad280f 100644
--- a/content/apacheds/advanced-ug/4.2.5.1-userclasses.html
+++ b/content/apacheds/advanced-ug/4.2.5.1-userclasses.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.5.1 - UserClasses &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.5.2-protecteditems.html b/content/apacheds/advanced-ug/4.2.5.2-protecteditems.html
index 325847a..394acb3 100644
--- a/content/apacheds/advanced-ug/4.2.5.2-protecteditems.html
+++ b/content/apacheds/advanced-ug/4.2.5.2-protecteditems.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.5.2 - ProtectedItems &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.5.3-permissions.html b/content/apacheds/advanced-ug/4.2.5.3-permissions.html
index 8af4d7b..8de1ab5 100644
--- a/content/apacheds/advanced-ug/4.2.5.3-permissions.html
+++ b/content/apacheds/advanced-ug/4.2.5.3-permissions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.5.3 - Permissions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.5.4-subtrees.html b/content/apacheds/advanced-ug/4.2.5.4-subtrees.html
index 5388dd4..8f6b885 100644
--- a/content/apacheds/advanced-ug/4.2.5.4-subtrees.html
+++ b/content/apacheds/advanced-ug/4.2.5.4-subtrees.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.5.4 - Subtrees &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html b/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html
index 78e9e1a..5edad9d 100644
--- a/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html
+++ b/content/apacheds/advanced-ug/4.2.6-the-acdf-engine.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.6 - The ACDF engine &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.6.1-how-it-works.html b/content/apacheds/advanced-ug/4.2.6.1-how-it-works.html
index 4124203..d5278fc 100644
--- a/content/apacheds/advanced-ug/4.2.6.1-how-it-works.html
+++ b/content/apacheds/advanced-ug/4.2.6.1-how-it-works.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.6.1 - How it works &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.6.2-selections.html b/content/apacheds/advanced-ug/4.2.6.2-selections.html
index bb28b0d..0c3c13d 100644
--- a/content/apacheds/advanced-ug/4.2.6.2-selections.html
+++ b/content/apacheds/advanced-ug/4.2.6.2-selections.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.6.2 - Selections &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.6.3-constraints.html b/content/apacheds/advanced-ug/4.2.6.3-constraints.html
index b3136cb..39f92ec 100644
--- a/content/apacheds/advanced-ug/4.2.6.3-constraints.html
+++ b/content/apacheds/advanced-ug/4.2.6.3-constraints.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.6.3 - Constraints &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.6.4-priority.html b/content/apacheds/advanced-ug/4.2.6.4-priority.html
index 74bb423..1b47bcc 100644
--- a/content/apacheds/advanced-ug/4.2.6.4-priority.html
+++ b/content/apacheds/advanced-ug/4.2.6.4-priority.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.6.4 - Priority &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html b/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html
index 3e8fd29..cd295b7 100644
--- a/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html
+++ b/content/apacheds/advanced-ug/4.2.7-using-acis-trail.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.7 - Using ACIs trail &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html b/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
index fdedbd8..e416f4c 100644
--- a/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
+++ b/content/apacheds/advanced-ug/4.2.7.1-enable-authenticated-users-to-browse-and-read-entries.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.7.1 - Enable Authenticated Users to Browse and Read Entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html b/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html
index 35f23c7..76d4e4c 100644
--- a/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html
+++ b/content/apacheds/advanced-ug/4.2.7.2-allow-self-password-modify.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.7.2 - Allow Self Password Modify &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.8-acis-administration.html b/content/apacheds/advanced-ug/4.2.8-acis-administration.html
index df54dea..0702a7f 100644
--- a/content/apacheds/advanced-ug/4.2.8-acis-administration.html
+++ b/content/apacheds/advanced-ug/4.2.8-acis-administration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.8 - ACIs administration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html b/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html
index d3eb293..91dc202 100644
--- a/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html
+++ b/content/apacheds/advanced-ug/4.2.9-migration-from-other-ldap-servers.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.9 - Migration from other LDAP servers &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/4.3-password-policy.html b/content/apacheds/advanced-ug/4.3-password-policy.html
index b9707fe..1e802da 100644
--- a/content/apacheds/advanced-ug/4.3-password-policy.html
+++ b/content/apacheds/advanced-ug/4.3-password-policy.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.3. Password Policy &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5-administration.html b/content/apacheds/advanced-ug/5-administration.html
index 92af452..913ed0e 100644
--- a/content/apacheds/advanced-ug/5-administration.html
+++ b/content/apacheds/advanced-ug/5-administration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5 - Administration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5.1-layout.html b/content/apacheds/advanced-ug/5.1-layout.html
index 23063b7..e2355f1 100644
--- a/content/apacheds/advanced-ug/5.1-layout.html
+++ b/content/apacheds/advanced-ug/5.1-layout.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.1 - Layout &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5.2-start-stop.html b/content/apacheds/advanced-ug/5.2-start-stop.html
index 57dfb87..db2418c 100644
--- a/content/apacheds/advanced-ug/5.2-start-stop.html
+++ b/content/apacheds/advanced-ug/5.2-start-stop.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.2 - Starting and Stopping the server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5.3-logs.html b/content/apacheds/advanced-ug/5.3-logs.html
index 4e04c4b..93eed09 100644
--- a/content/apacheds/advanced-ug/5.3-logs.html
+++ b/content/apacheds/advanced-ug/5.3-logs.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.3 - Logs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5.4-replication.html b/content/apacheds/advanced-ug/5.4-replication.html
index a449d02..dabc23b 100644
--- a/content/apacheds/advanced-ug/5.4-replication.html
+++ b/content/apacheds/advanced-ug/5.4-replication.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.4 - Replication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/5.5-cache.html b/content/apacheds/advanced-ug/5.5-cache.html
index 96a6ede..1fad031 100644
--- a/content/apacheds/advanced-ug/5.5-cache.html
+++ b/content/apacheds/advanced-ug/5.5-cache.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.5 - Cache &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/6-implementing-interceptor.html b/content/apacheds/advanced-ug/6-implementing-interceptor.html
index 46f161e..803a9cc 100644
--- a/content/apacheds/advanced-ug/6-implementing-interceptor.html
+++ b/content/apacheds/advanced-ug/6-implementing-interceptor.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - Implementing a simple custom Interceptor for ApacheDS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/7-embedding-apacheds.html b/content/apacheds/advanced-ug/7-embedding-apacheds.html
index 64d7e17..82b87fc 100644
--- a/content/apacheds/advanced-ug/7-embedding-apacheds.html
+++ b/content/apacheds/advanced-ug/7-embedding-apacheds.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7 - Embedding ApacheDS in Java &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/8-operational-attributes.html b/content/apacheds/advanced-ug/8-operational-attributes.html
index abe5124..802d48b 100644
--- a/content/apacheds/advanced-ug/8-operational-attributes.html
+++ b/content/apacheds/advanced-ug/8-operational-attributes.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>8 - Operational Attributes &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-ug/9-apacheds-internals.html b/content/apacheds/advanced-ug/9-apacheds-internals.html
index 7baf98a..7c23ee9 100644
--- a/content/apacheds/advanced-ug/9-apacheds-internals.html
+++ b/content/apacheds/advanced-ug/9-apacheds-internals.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>9 - ApacheDS internals &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/advanced-user-guide.html b/content/apacheds/advanced-user-guide.html
index 2c69d0f..56e1580 100644
--- a/content/apacheds/advanced-user-guide.html
+++ b/content/apacheds/advanced-user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Advanced User Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1-how-to-begin.html b/content/apacheds/basic-ug/1-how-to-begin.html
index 75bff48..02a77ac 100644
--- a/content/apacheds/basic-ug/1-how-to-begin.html
+++ b/content/apacheds/basic-ug/1-how-to-begin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - How To Begin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.1-what-apacheds-is.html b/content/apacheds/basic-ug/1.1-what-apacheds-is.html
index 91ebfe9..c328d53 100644
--- a/content/apacheds/basic-ug/1.1-what-apacheds-is.html
+++ b/content/apacheds/basic-ug/1.1-what-apacheds-is.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - What Apache DS is &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.2-some-background.html b/content/apacheds/basic-ug/1.2-some-background.html
index 682da8f..59a7a70 100644
--- a/content/apacheds/basic-ug/1.2-some-background.html
+++ b/content/apacheds/basic-ug/1.2-some-background.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2 - Some Background. Directories, directory services and LDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
@@ -215,7 +217,7 @@ ISBN: 978-3-939084-07-5 <br/></p>
 <h3 id="articles-forums-blogs-and-other-online-resources">Articles, forums, blogs and other online resources</h3>
 <h4 id="blogs">Blogs</h4>
 <ul>
-<li><a href="http://blogs.sun.com/roller/page/DirectoryManager">cn=Directory Manager - All about Directory Server</a>, Sun Blog</li>
+<li><a href="https://nawilson.com/">dc=nawilson,dc=com - LDAP, programming, security, movies, and other stuff</a>, Neil Wilson Blog</li>
 </ul>
 <h4 id="articles-and-other-online-resources">Articles and other online resources</h4>
 <ul>
diff --git a/content/apacheds/basic-ug/1.3-installing-and-starting.html b/content/apacheds/basic-ug/1.3-installing-and-starting.html
index e9e6e0d..2c83672 100644
--- a/content/apacheds/basic-ug/1.3-installing-and-starting.html
+++ b/content/apacheds/basic-ug/1.3-installing-and-starting.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.3 - Installing and starting the server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html b/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
index a3b18d1..6ebc379 100644
--- a/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
+++ b/content/apacheds/basic-ug/1.4-basic-configuration-tasks.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4 - Basic configuration tasks &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4.1-changing-server-port.html b/content/apacheds/basic-ug/1.4.1-changing-server-port.html
index ff3a857..92f3b96 100644
--- a/content/apacheds/basic-ug/1.4.1-changing-server-port.html
+++ b/content/apacheds/basic-ug/1.4.1-changing-server-port.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4.1 - Changing the server port for LDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4.2-changing-admin-password.html b/content/apacheds/basic-ug/1.4.2-changing-admin-password.html
index 8019b1b..73d8b7e 100644
--- a/content/apacheds/basic-ug/1.4.2-changing-admin-password.html
+++ b/content/apacheds/basic-ug/1.4.2-changing-admin-password.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4.2 - Changing the admin password &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4.3-adding-partition.html b/content/apacheds/basic-ug/1.4.3-adding-partition.html
index c7da13d..678708f 100644
--- a/content/apacheds/basic-ug/1.4.3-adding-partition.html
+++ b/content/apacheds/basic-ug/1.4.3-adding-partition.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4.3 - Adding your own partition &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4.4-configure-logging.html b/content/apacheds/basic-ug/1.4.4-configure-logging.html
index 111bab1..1a1a6e8 100644
--- a/content/apacheds/basic-ug/1.4.4-configure-logging.html
+++ b/content/apacheds/basic-ug/1.4.4-configure-logging.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4.4 - Configure logging &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.4.5-anonymous-access.html b/content/apacheds/basic-ug/1.4.5-anonymous-access.html
index ec790e2..231e797 100644
--- a/content/apacheds/basic-ug/1.4.5-anonymous-access.html
+++ b/content/apacheds/basic-ug/1.4.5-anonymous-access.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4.5 - Enable and disable anonymous access &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.5-sample-configuration.html b/content/apacheds/basic-ug/1.5-sample-configuration.html
index a3c050d..2f84af5 100644
--- a/content/apacheds/basic-ug/1.5-sample-configuration.html
+++ b/content/apacheds/basic-ug/1.5-sample-configuration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.5. - About the sample configurations and sample directory data &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/1.6-backup-restore.html b/content/apacheds/basic-ug/1.6-backup-restore.html
index af3b62c..d339180 100644
--- a/content/apacheds/basic-ug/1.6-backup-restore.html
+++ b/content/apacheds/basic-ug/1.6-backup-restore.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.6. - Backup/Restore &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2-handling-data.html b/content/apacheds/basic-ug/2-handling-data.html
index 9c38284..590bfdf 100644
--- a/content/apacheds/basic-ug/2-handling-data.html
+++ b/content/apacheds/basic-ug/2-handling-data.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Handling of data within your directory &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.1-data-modification.html b/content/apacheds/basic-ug/2.1-data-modification.html
index 35c7109..a4bd3bd 100644
--- a/content/apacheds/basic-ug/2.1-data-modification.html
+++ b/content/apacheds/basic-ug/2.1-data-modification.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - Data modification &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.1.1-adding-entries.html b/content/apacheds/basic-ug/2.1.1-adding-entries.html
index 26fbee6..b97c1e2 100644
--- a/content/apacheds/basic-ug/2.1.1-adding-entries.html
+++ b/content/apacheds/basic-ug/2.1.1-adding-entries.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1.1 - Adding Entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.1.2-deleting-entries.html b/content/apacheds/basic-ug/2.1.2-deleting-entries.html
index ff47957..1cbafea 100644
--- a/content/apacheds/basic-ug/2.1.2-deleting-entries.html
+++ b/content/apacheds/basic-ug/2.1.2-deleting-entries.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1.2 - Deleting Entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.2-searching-data.html b/content/apacheds/basic-ug/2.2-searching-data.html
index 83578c7..5c77c7e 100644
--- a/content/apacheds/basic-ug/2.2-searching-data.html
+++ b/content/apacheds/basic-ug/2.2-searching-data.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2 - Searching Data &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.2.1-simple-search.html b/content/apacheds/basic-ug/2.2.1-simple-search.html
index faaf601..e445b14 100644
--- a/content/apacheds/basic-ug/2.2.1-simple-search.html
+++ b/content/apacheds/basic-ug/2.2.1-simple-search.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.1 - Simple search &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.2.2-more-search-options.html b/content/apacheds/basic-ug/2.2.2-more-search-options.html
index 79c2e64..d1454e7 100644
--- a/content/apacheds/basic-ug/2.2.2-more-search-options.html
+++ b/content/apacheds/basic-ug/2.2.2-more-search-options.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2.2 - More search options &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.3-introducing-schema.html b/content/apacheds/basic-ug/2.3-introducing-schema.html
index 315d426..0beb45f 100644
--- a/content/apacheds/basic-ug/2.3-introducing-schema.html
+++ b/content/apacheds/basic-ug/2.3-introducing-schema.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - The Schema &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html b/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html
index 3cab25f..aa64b5f 100644
--- a/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html
+++ b/content/apacheds/basic-ug/2.3.1-adding-schema-elements.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3.1 - Adding Schema Elements &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/2.3.2-enabling-schema.html b/content/apacheds/basic-ug/2.3.2-enabling-schema.html
index e8d55a4..90fab36 100644
--- a/content/apacheds/basic-ug/2.3.2-enabling-schema.html
+++ b/content/apacheds/basic-ug/2.3.2-enabling-schema.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3.2 - Enabling Schema &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/3-basic-security.html b/content/apacheds/basic-ug/3-basic-security.html
index 0a3265f..8a8fa6b 100644
--- a/content/apacheds/basic-ug/3-basic-security.html
+++ b/content/apacheds/basic-ug/3-basic-security.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Basic Security &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/3.1-authentication-options.html b/content/apacheds/basic-ug/3.1-authentication-options.html
index 682a57f..5ca5090 100644
--- a/content/apacheds/basic-ug/3.1-authentication-options.html
+++ b/content/apacheds/basic-ug/3.1-authentication-options.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.1 - Authentication options &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/3.2-basic-authorization.html b/content/apacheds/basic-ug/3.2-basic-authorization.html
index 7e91ee2..75b3414 100644
--- a/content/apacheds/basic-ug/3.2-basic-authorization.html
+++ b/content/apacheds/basic-ug/3.2-basic-authorization.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.2 - Basic authorization &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/3.3-enabling-ssl.html b/content/apacheds/basic-ug/3.3-enabling-ssl.html
index 64d4514..325508f 100644
--- a/content/apacheds/basic-ug/3.3-enabling-ssl.html
+++ b/content/apacheds/basic-ug/3.3-enabling-ssl.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.3 - How to enable SSL &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/4-integrating-apacheds.html b/content/apacheds/basic-ug/4-integrating-apacheds.html
index 059b590..e099946 100644
--- a/content/apacheds/basic-ug/4-integrating-apacheds.html
+++ b/content/apacheds/basic-ug/4-integrating-apacheds.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Integrating ApacheDS with other programs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html b/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
index 5f76384..5070ac7 100644
--- a/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
+++ b/content/apacheds/basic-ug/4.1-mozilla-thunderbird.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1 - Mozilla Thunderbird Integration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
@@ -214,7 +216,7 @@ Furthermore you need an LDAP server up and running, which address data should be
 <h2 id="resources">Resources</h2>
 <ul>
 <li><a href="http://opensourcearticles.com/articles/introduction_to_thunderbird">An introduction to Thunderbird</a>, Open Source Articles</li>
-<li><a href="http://www.mozilla.org/projects/thunderbird/specs/ldap.html">LDAP Attribute Mapping</a> for Mozilla Thunderbird</li>
+<li><a href="https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/LDAP_Support">LDAP Attribute Mapping</a> for Mozilla Thunderbird</li>
 </ul>
 
 
diff --git a/content/apacheds/basic-user-guide.html b/content/apacheds/basic-user-guide.html
index f915ad4..b9cf780 100644
--- a/content/apacheds/basic-user-guide.html
+++ b/content/apacheds/basic-user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Basic User Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/coding-standards.html b/content/apacheds/coding-standards.html
index aa53f8c..5111fb4 100644
--- a/content/apacheds/coding-standards.html
+++ b/content/apacheds/coding-standards.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Coding Standards &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/configuration/ads-2.0-configuration.html b/content/apacheds/configuration/ads-2.0-configuration.html
index 07c7b48..e985967 100644
--- a/content/apacheds/configuration/ads-2.0-configuration.html
+++ b/content/apacheds/configuration/ads-2.0-configuration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>ADS 2.0 configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/configuration/adsconfig.html b/content/apacheds/configuration/adsconfig.html
index 573ef65..ddf2cdd 100644
--- a/content/apacheds/configuration/adsconfig.html
+++ b/content/apacheds/configuration/adsconfig.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>ADS config &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/developer-guide.html b/content/apacheds/developer-guide.html
index 370aec1..b78e99d 100644
--- a/content/apacheds/developer-guide.html
+++ b/content/apacheds/developer-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Developers Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download-old-versions.html b/content/apacheds/download-old-versions.html
index a0be215..ddcd358 100644
--- a/content/apacheds/download-old-versions.html
+++ b/content/apacheds/download-old-versions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download Old Versions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-archive.html b/content/apacheds/download/download-archive.html
index 6deca01..a6d9657 100644
--- a/content/apacheds/download/download-archive.html
+++ b/content/apacheds/download/download-archive.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-linux-bin.html b/content/apacheds/download/download-linux-bin.html
index b960df6..dfbfad6 100644
--- a/content/apacheds/download/download-linux-bin.html
+++ b/content/apacheds/download/download-linux-bin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Linux Binary Installer &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-linux-deb.html b/content/apacheds/download/download-linux-deb.html
index faa71ea..f773da0 100644
--- a/content/apacheds/download/download-linux-deb.html
+++ b/content/apacheds/download/download-linux-deb.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Linux Debian Package &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-linux-rpm.html b/content/apacheds/download/download-linux-rpm.html
index 730c58b..10be2da 100644
--- a/content/apacheds/download/download-linux-rpm.html
+++ b/content/apacheds/download/download-linux-rpm.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Linux RPM Package &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-macosx.html b/content/apacheds/download/download-macosx.html
index 60d988d..f9ad646 100644
--- a/content/apacheds/download/download-macosx.html
+++ b/content/apacheds/download/download-macosx.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Mac OS X &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-sources.html b/content/apacheds/download/download-sources.html
index dbcd166..c01e7c6 100644
--- a/content/apacheds/download/download-sources.html
+++ b/content/apacheds/download/download-sources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/download/download-windows.html b/content/apacheds/download/download-windows.html
index 5bb646e..0248148 100644
--- a/content/apacheds/download/download-windows.html
+++ b/content/apacheds/download/download-windows.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download for Windows &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/downloads.html b/content/apacheds/downloads.html
index f95cd9d..6c32916 100644
--- a/content/apacheds/downloads.html
+++ b/content/apacheds/downloads.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/features.html b/content/apacheds/features.html
index df37dac..9a730ed 100644
--- a/content/apacheds/features.html
+++ b/content/apacheds/features.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Features &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/index.html b/content/apacheds/index.html
index 3f2a71b..b0836b5 100644
--- a/content/apacheds/index.html
+++ b/content/apacheds/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to ApacheDS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/internal-design-guide/internal-design-guide.html b/content/apacheds/internal-design-guide/internal-design-guide.html
index 5c8026e..875f4a5 100644
--- a/content/apacheds/internal-design-guide/internal-design-guide.html
+++ b/content/apacheds/internal-design-guide/internal-design-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Apache DS - Internal Design Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1-kerberos.html b/content/apacheds/kerberos-ug/1-kerberos.html
index 7b9d9e4..df43b82 100644
--- a/content/apacheds/kerberos-ug/1-kerberos.html
+++ b/content/apacheds/kerberos-ug/1-kerberos.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - What is Kerberos ? &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1-introduction.html b/content/apacheds/kerberos-ug/1.1-introduction.html
index abd4cf7..2d69c83 100644
--- a/content/apacheds/kerberos-ug/1.1-introduction.html
+++ b/content/apacheds/kerberos-ug/1.1-introduction.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - Introduction &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.1-realms.html b/content/apacheds/kerberos-ug/1.1.1-realms.html
index 00b84e8..ecd76b4 100644
--- a/content/apacheds/kerberos-ug/1.1.1-realms.html
+++ b/content/apacheds/kerberos-ug/1.1.1-realms.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.1 - Realms &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.2-principals.html b/content/apacheds/kerberos-ug/1.1.2-principals.html
index ae6efc7..690a03d 100644
--- a/content/apacheds/kerberos-ug/1.1.2-principals.html
+++ b/content/apacheds/kerberos-ug/1.1.2-principals.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.2 - Principals &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.3-keys.html b/content/apacheds/kerberos-ug/1.1.3-keys.html
index e494ff8..7a58f96 100644
--- a/content/apacheds/kerberos-ug/1.1.3-keys.html
+++ b/content/apacheds/kerberos-ug/1.1.3-keys.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.3 - Keys &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.4-kdc.html b/content/apacheds/kerberos-ug/1.1.4-kdc.html
index cd970a0..150c577 100644
--- a/content/apacheds/kerberos-ug/1.1.4-kdc.html
+++ b/content/apacheds/kerberos-ug/1.1.4-kdc.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.4 - KDC (Key Distribution Center) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.5-database.html b/content/apacheds/kerberos-ug/1.1.5-database.html
index f3bee06..668b887 100644
--- a/content/apacheds/kerberos-ug/1.1.5-database.html
+++ b/content/apacheds/kerberos-ug/1.1.5-database.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.5 - Database &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.6-as.html b/content/apacheds/kerberos-ug/1.1.6-as.html
index 8696eaf..bcd9e36 100644
--- a/content/apacheds/kerberos-ug/1.1.6-as.html
+++ b/content/apacheds/kerberos-ug/1.1.6-as.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.6 - AS (Authentication Server) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.7-tgs.html b/content/apacheds/kerberos-ug/1.1.7-tgs.html
index 270c3fa..d3708bb 100644
--- a/content/apacheds/kerberos-ug/1.1.7-tgs.html
+++ b/content/apacheds/kerberos-ug/1.1.7-tgs.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.7 - TGS (Ticket Granting Server) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.1.8-tickets.html b/content/apacheds/kerberos-ug/1.1.8-tickets.html
index 9da7258..bca2219 100644
--- a/content/apacheds/kerberos-ug/1.1.8-tickets.html
+++ b/content/apacheds/kerberos-ug/1.1.8-tickets.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1.8 - Tickets &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.2-resources.html b/content/apacheds/kerberos-ug/1.2-resources.html
index c74fa49..db62c94 100644
--- a/content/apacheds/kerberos-ug/1.2-resources.html
+++ b/content/apacheds/kerberos-ug/1.2-resources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2 - Resources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.2.1-kerberos-articles.html b/content/apacheds/kerberos-ug/1.2.1-kerberos-articles.html
index ac5bf8d..f958b15 100644
--- a/content/apacheds/kerberos-ug/1.2.1-kerberos-articles.html
+++ b/content/apacheds/kerberos-ug/1.2.1-kerberos-articles.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2.1 - Kerberos Articles &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.2.2-microsoft-compatibility.html b/content/apacheds/kerberos-ug/1.2.2-microsoft-compatibility.html
index 570607f..d8808c8 100644
--- a/content/apacheds/kerberos-ug/1.2.2-microsoft-compatibility.html
+++ b/content/apacheds/kerberos-ug/1.2.2-microsoft-compatibility.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2.2 - Microsoft Compatibility &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/1.2.3-standards.html b/content/apacheds/kerberos-ug/1.2.3-standards.html
index 8dfaae3..42f4fd0 100644
--- a/content/apacheds/kerberos-ug/1.2.3-standards.html
+++ b/content/apacheds/kerberos-ug/1.2.3-standards.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2.3 - Standards &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2-kerberos-config.html b/content/apacheds/kerberos-ug/2-kerberos-config.html
index 5ebc20a..812469d 100644
--- a/content/apacheds/kerberos-ug/2-kerberos-config.html
+++ b/content/apacheds/kerberos-ug/2-kerberos-config.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Kerberos Configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.1-installing.html b/content/apacheds/kerberos-ug/2.1-installing.html
index 096a5d6..6f1e40f 100644
--- a/content/apacheds/kerberos-ug/2.1-installing.html
+++ b/content/apacheds/kerberos-ug/2.1-installing.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - Installing the server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.2-ldap-server-config.html b/content/apacheds/kerberos-ug/2.2-ldap-server-config.html
index a09390d..eceba55 100644
--- a/content/apacheds/kerberos-ug/2.2-ldap-server-config.html
+++ b/content/apacheds/kerberos-ug/2.2-ldap-server-config.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2 - LDAP server configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.3-kerberos-server-config.html b/content/apacheds/kerberos-ug/2.3-kerberos-server-config.html
index f491c9f..854c8ad 100644
--- a/content/apacheds/kerberos-ug/2.3-kerberos-server-config.html
+++ b/content/apacheds/kerberos-ug/2.3-kerberos-server-config.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - Kerberos server configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.4-kerberos-ulp.html b/content/apacheds/kerberos-ug/2.4-kerberos-ulp.html
index 97d4b69..869f22b 100644
--- a/content/apacheds/kerberos-ug/2.4-kerberos-ulp.html
+++ b/content/apacheds/kerberos-ug/2.4-kerberos-ulp.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.4 - Kerberos and Unlimited Strength Policy &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.5-pkinit.html b/content/apacheds/kerberos-ug/2.5-pkinit.html
index ad29f55..94271de 100644
--- a/content/apacheds/kerberos-ug/2.5-pkinit.html
+++ b/content/apacheds/kerberos-ug/2.5-pkinit.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.5 - PKINIT &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/2.6-cross-realm.html b/content/apacheds/kerberos-ug/2.6-cross-realm.html
index 1685eef..17f6e48 100644
--- a/content/apacheds/kerberos-ug/2.6-cross-realm.html
+++ b/content/apacheds/kerberos-ug/2.6-cross-realm.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.6 - Cross Realm &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3-kerberos-admin.html b/content/apacheds/kerberos-ug/3-kerberos-admin.html
index fee9fc9..745dcb9 100644
--- a/content/apacheds/kerberos-ug/3-kerberos-admin.html
+++ b/content/apacheds/kerberos-ug/3-kerberos-admin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Kerberos administration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.1-start-stop.html b/content/apacheds/kerberos-ug/3.1-start-stop.html
index 9f24789..b9c9544 100644
--- a/content/apacheds/kerberos-ug/3.1-start-stop.html
+++ b/content/apacheds/kerberos-ug/3.1-start-stop.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.1 - Starting and Stopping the server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.2-managing-clients-services.html b/content/apacheds/kerberos-ug/3.2-managing-clients-services.html
index 094ec32..1563a14 100644
--- a/content/apacheds/kerberos-ug/3.2-managing-clients-services.html
+++ b/content/apacheds/kerberos-ug/3.2-managing-clients-services.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.2 - Managing Clients and Services &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.3-change-password.html b/content/apacheds/kerberos-ug/3.3-change-password.html
index 609b813..74ae53c 100644
--- a/content/apacheds/kerberos-ug/3.3-change-password.html
+++ b/content/apacheds/kerberos-ug/3.3-change-password.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.3 - Changing passwords &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.4-logs.html b/content/apacheds/kerberos-ug/3.4-logs.html
index 61248ca..1e78fbd 100644
--- a/content/apacheds/kerberos-ug/3.4-logs.html
+++ b/content/apacheds/kerberos-ug/3.4-logs.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.4 - Logs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.5-replication.html b/content/apacheds/kerberos-ug/3.5-replication.html
index edaffee..ef78eb9 100644
--- a/content/apacheds/kerberos-ug/3.5-replication.html
+++ b/content/apacheds/kerberos-ug/3.5-replication.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.5 - Replication &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/3.6-backup-restore.html b/content/apacheds/kerberos-ug/3.6-backup-restore.html
index 3a14157..c906f10 100644
--- a/content/apacheds/kerberos-ug/3.6-backup-restore.html
+++ b/content/apacheds/kerberos-ug/3.6-backup-restore.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.6 - Backup/Restore &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/4-using-kerberos.html b/content/apacheds/kerberos-ug/4-using-kerberos.html
index c8e6da4..4799305 100644
--- a/content/apacheds/kerberos-ug/4-using-kerberos.html
+++ b/content/apacheds/kerberos-ug/4-using-kerberos.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Using Kerberos &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html b/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html
index 0edde91..325cf69 100644
--- a/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html
+++ b/content/apacheds/kerberos-ug/4.1-authenticate-kinit.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1 - Authenticate with kinit on Linux &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/4.2-authenticate-studio.html b/content/apacheds/kerberos-ug/4.2-authenticate-studio.html
index 326f3bb..e80006a 100644
--- a/content/apacheds/kerberos-ug/4.2-authenticate-studio.html
+++ b/content/apacheds/kerberos-ug/4.2-authenticate-studio.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2 - Authenticate with Studio &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/5-interoperability.html b/content/apacheds/kerberos-ug/5-interoperability.html
index 9ac6a99..dd22a16 100644
--- a/content/apacheds/kerberos-ug/5-interoperability.html
+++ b/content/apacheds/kerberos-ug/5-interoperability.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5 Interoperability &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-ug/6-glossary.html b/content/apacheds/kerberos-ug/6-glossary.html
index b0b7ccf..84eea6f 100644
--- a/content/apacheds/kerberos-ug/6-glossary.html
+++ b/content/apacheds/kerberos-ug/6-glossary.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - Kerberos Glossary &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/kerberos-user-guide.html b/content/apacheds/kerberos-user-guide.html
index 50536a1..96fc85a 100644
--- a/content/apacheds/kerberos-user-guide.html
+++ b/content/apacheds/kerberos-user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerberos User Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/apacheds/news.html b/content/apacheds/news.html
index 899e936..3052a3a 100644
--- a/content/apacheds/news.html
+++ b/content/apacheds/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api.html b/content/api.html
index 630bfcf..daf7209 100644
--- a/content/api.html
+++ b/content/api.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Apis &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/coding-standards.html b/content/api/coding-standards.html
index fe2e0cc..7f6f303 100644
--- a/content/api/coding-standards.html
+++ b/content/api/coding-standards.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Coding Standards &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/developer-guide.html b/content/api/developer-guide.html
index c3a7545..6bfc405 100644
--- a/content/api/developer-guide.html
+++ b/content/api/developer-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP Java API - Developer Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/download-old-versions.html b/content/api/download-old-versions.html
index 142d841..6f84df7 100644
--- a/content/api/download-old-versions.html
+++ b/content/api/download-old-versions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download Old Versions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/download/download-archive-1.html b/content/api/download/download-archive-1.html
index b315bbf..9c0a90d 100644
--- a/content/api/download/download-archive-1.html
+++ b/content/api/download/download-archive-1.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/download/download-archive-2.html b/content/api/download/download-archive-2.html
index e5edc8d..5710522 100644
--- a/content/api/download/download-archive-2.html
+++ b/content/api/download/download-archive-2.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/download/download-sources-1.html b/content/api/download/download-sources-1.html
index 4937d5b..97792be 100644
--- a/content/api/download/download-sources-1.html
+++ b/content/api/download/download-sources-1.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/download/download-sources-2.html b/content/api/download/download-sources-2.html
index a5ecfb9..8301256 100644
--- a/content/api/download/download-sources-2.html
+++ b/content/api/download/download-sources-2.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/downloads-1.html b/content/api/downloads-1.html
index c9c84b2..80f4340 100644
--- a/content/api/downloads-1.html
+++ b/content/api/downloads-1.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP API Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/downloads-2.html b/content/api/downloads-2.html
index 464e5e0..a7875f3 100644
--- a/content/api/downloads-2.html
+++ b/content/api/downloads-2.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP API Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/five-minutes-tutorial.html b/content/api/five-minutes-tutorial.html
index 57107c9..db8f335 100644
--- a/content/api/five-minutes-tutorial.html
+++ b/content/api/five-minutes-tutorial.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Five Minute Tutorial &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/index.html b/content/api/index.html
index b5b27b4..2b75395 100644
--- a/content/api/index.html
+++ b/content/api/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to Apache Directory LDAP API &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide.html b/content/api/internal-design-guide.html
index 9c44031..aeaf9b1 100644
--- a/content/api/internal-design-guide.html
+++ b/content/api/internal-design-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP Java API - Internal Design Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/1-introduction.html b/content/api/internal-design-guide/1-introduction.html
index d15b0cd..ea69a53 100644
--- a/content/api/internal-design-guide/1-introduction.html
+++ b/content/api/internal-design-guide/1-introduction.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - Introduction &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/10-entry.html b/content/api/internal-design-guide/10-entry.html
index f3213e9..2e4f925 100644
--- a/content/api/internal-design-guide/10-entry.html
+++ b/content/api/internal-design-guide/10-entry.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>10 - Entry &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/11-filter.html b/content/api/internal-design-guide/11-filter.html
index 18b9d65..f662357 100644
--- a/content/api/internal-design-guide/11-filter.html
+++ b/content/api/internal-design-guide/11-filter.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>11 - Filter &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/12-cursor.html b/content/api/internal-design-guide/12-cursor.html
index d637ac8..b38ea61 100644
--- a/content/api/internal-design-guide/12-cursor.html
+++ b/content/api/internal-design-guide/12-cursor.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>12 - Cursor &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/13-controls.html b/content/api/internal-design-guide/13-controls.html
index 6fe6ee5..dd95848 100644
--- a/content/api/internal-design-guide/13-controls.html
+++ b/content/api/internal-design-guide/13-controls.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>13 - Controls &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/14-extended-operations.html b/content/api/internal-design-guide/14-extended-operations.html
index 8519d42..463d4c2 100644
--- a/content/api/internal-design-guide/14-extended-operations.html
+++ b/content/api/internal-design-guide/14-extended-operations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>14 - Extended Operations &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/15-ldif.html b/content/api/internal-design-guide/15-ldif.html
index 07964ee..21fadce 100644
--- a/content/api/internal-design-guide/15-ldif.html
+++ b/content/api/internal-design-guide/15-ldif.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>15 - LDIF &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/16-dsml.html b/content/api/internal-design-guide/16-dsml.html
index 0970f75..9f6f65a 100644
--- a/content/api/internal-design-guide/16-dsml.html
+++ b/content/api/internal-design-guide/16-dsml.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>16 - DSML &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/17-osgi.html b/content/api/internal-design-guide/17-osgi.html
index 4e041e9..8790deb 100644
--- a/content/api/internal-design-guide/17-osgi.html
+++ b/content/api/internal-design-guide/17-osgi.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>17 - OSGi &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/2-general-structure.html b/content/api/internal-design-guide/2-general-structure.html
index 0e43561..5800003 100644
--- a/content/api/internal-design-guide/2-general-structure.html
+++ b/content/api/internal-design-guide/2-general-structure.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - General Structure &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/3-building.html b/content/api/internal-design-guide/3-building.html
index 9e179bb..0e5d546 100644
--- a/content/api/internal-design-guide/3-building.html
+++ b/content/api/internal-design-guide/3-building.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Building &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/4-asn1.html b/content/api/internal-design-guide/4-asn1.html
index 7612dc7..473a1ac 100644
--- a/content/api/internal-design-guide/4-asn1.html
+++ b/content/api/internal-design-guide/4-asn1.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - ASN/1 &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/4.1-asn1-tlv.html b/content/api/internal-design-guide/4.1-asn1-tlv.html
index a8c34ae..8cac585 100644
--- a/content/api/internal-design-guide/4.1-asn1-tlv.html
+++ b/content/api/internal-design-guide/4.1-asn1-tlv.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4-1 - ASN/1 TLV &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/5-network.html b/content/api/internal-design-guide/5-network.html
index dccc6d4..d5f278d 100644
--- a/content/api/internal-design-guide/5-network.html
+++ b/content/api/internal-design-guide/5-network.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5 - Network &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/6-codec.html b/content/api/internal-design-guide/6-codec.html
index 4771d30..049fab4 100644
--- a/content/api/internal-design-guide/6-codec.html
+++ b/content/api/internal-design-guide/6-codec.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - Encoding/Decoding &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/7-ldap-messages.html b/content/api/internal-design-guide/7-ldap-messages.html
index 58b64a0..893cb46 100644
--- a/content/api/internal-design-guide/7-ldap-messages.html
+++ b/content/api/internal-design-guide/7-ldap-messages.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7 - LDAP Messages &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/8-schema.html b/content/api/internal-design-guide/8-schema.html
index 3e39ea9..d63a792 100644
--- a/content/api/internal-design-guide/8-schema.html
+++ b/content/api/internal-design-guide/8-schema.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>8 - Schema &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/internal-design-guide/9-dn.html b/content/api/internal-design-guide/9-dn.html
index de838e8..0645a51 100644
--- a/content/api/internal-design-guide/9-dn.html
+++ b/content/api/internal-design-guide/9-dn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>9 - DN &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/java-api.html b/content/api/java-api.html
index 651952b..0ebaa55 100644
--- a/content/api/java-api.html
+++ b/content/api/java-api.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP Java API &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/migration-guide.html b/content/api/migration-guide.html
index 412f130..77fde8b 100644
--- a/content/api/migration-guide.html
+++ b/content/api/migration-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>API 1.0 to 2.0 migration guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/news.html b/content/api/news.html
index 707fcb0..ac325b3 100644
--- a/content/api/news.html
+++ b/content/api/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide.html b/content/api/user-guide.html
index 6996534..bdd5b69 100644
--- a/content/api/user-guide.html
+++ b/content/api/user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Users Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
@@ -139,7 +141,7 @@ Pages with a (e) at the end of the title are empty pages.
 Pages with a (...) at the end of the title are not yet completed.
 Other pages are finished (but may be reviewed).
 </DIV>
-<p>This document is about the LDAP API, developed at the Apache Software Foundation. It&rsquo;s a replacement for outdated Java/LDAP libraries like (<a href="http://www.openldap.org/jldap/">jLdap</a>, <a href="http://www.mozilla.org/directory/">Mozilla LDAP SDK</a> and <a href="http://www.oracle.com/technetwork/java/jndi/index.html">JNDI</a>).</p>
+<p>This document is about the LDAP API, developed at the Apache Software Foundation. It&rsquo;s a replacement for outdated Java/LDAP libraries like (<a href="http://www.openldap.org/jldap/">jLdap</a>, <a href="https://wiki.mozilla.org/Mozilla_LDAP_SDK_Programmer%27s_Guide/Getting_Started_With_LDAP_Java_SDK">Mozilla LDAP SDK</a> and <a href="http://www.oracle.com/technetwork/java/jndi/index.html">JNDI</a>).</p>
 <h2 id="about-this-guide">About this guide</h2>
 <p>Getting started. Learn how to use the LDAP API, connect to various LDAP servers, manipulate the data within a directory.</p>
 <h3 id="audience">Audience</h3>
diff --git a/content/api/user-guide/1-introduction.html b/content/api/user-guide/1-introduction.html
index 1147821..e9685c6 100644
--- a/content/api/user-guide/1-introduction.html
+++ b/content/api/user-guide/1-introduction.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - Introduction &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/1.1-java-and-ldap.html b/content/api/user-guide/1.1-java-and-ldap.html
index 9fd035f..f8587ba 100644
--- a/content/api/user-guide/1.1-java-and-ldap.html
+++ b/content/api/user-guide/1.1-java-and-ldap.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - Java and LDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/1.2-ldap-in-a-few-words.html b/content/api/user-guide/1.2-ldap-in-a-few-words.html
index 5f85090..7d8b705 100644
--- a/content/api/user-guide/1.2-ldap-in-a-few-words.html
+++ b/content/api/user-guide/1.2-ldap-in-a-few-words.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2 - LDAP in a few words &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/1.3-apache-ldap-api-rational.html b/content/api/user-guide/1.3-apache-ldap-api-rational.html
index 2376ef1..e2d8e5e 100644
--- a/content/api/user-guide/1.3-apache-ldap-api-rational.html
+++ b/content/api/user-guide/1.3-apache-ldap-api-rational.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.3 - The Apache LDAP API rational &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/1.4-preparation-to-code.html b/content/api/user-guide/1.4-preparation-to-code.html
index f18f4fd..aaf5b15 100644
--- a/content/api/user-guide/1.4-preparation-to-code.html
+++ b/content/api/user-guide/1.4-preparation-to-code.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4 - Preparation to code &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2-basic-ldap-api-usage.html b/content/api/user-guide/2-basic-ldap-api-usage.html
index 47e91b8..2da0039 100644
--- a/content/api/user-guide/2-basic-ldap-api-usage.html
+++ b/content/api/user-guide/2-basic-ldap-api-usage.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Basic LDAP API usage &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.1-connection-disconnection.html b/content/api/user-guide/2.1-connection-disconnection.html
index fb01eb0..1f6732d 100644
--- a/content/api/user-guide/2.1-connection-disconnection.html
+++ b/content/api/user-guide/2.1-connection-disconnection.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - Connection and disconnection &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.10-ldap-connection-template.html b/content/api/user-guide/2.10-ldap-connection-template.html
index b5a935c..7000cd2 100644
--- a/content/api/user-guide/2.10-ldap-connection-template.html
+++ b/content/api/user-guide/2.10-ldap-connection-template.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.10 - The LdapConnectionTemplate &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.11-filter-builder.html b/content/api/user-guide/2.11-filter-builder.html
index 6ca0da6..183703b 100644
--- a/content/api/user-guide/2.11-filter-builder.html
+++ b/content/api/user-guide/2.11-filter-builder.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.11 - The FilterBuilder &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.2-binding-unbinding.html b/content/api/user-guide/2.2-binding-unbinding.html
index 8c5a3cc..1b54cf9 100644
--- a/content/api/user-guide/2.2-binding-unbinding.html
+++ b/content/api/user-guide/2.2-binding-unbinding.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2 - Binding and unbinding &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.3-searching.html b/content/api/user-guide/2.3-searching.html
index 1263a4f..1e18fe8 100644
--- a/content/api/user-guide/2.3-searching.html
+++ b/content/api/user-guide/2.3-searching.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - Searching &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.4-adding.html b/content/api/user-guide/2.4-adding.html
index 06039c4..9796345 100644
--- a/content/api/user-guide/2.4-adding.html
+++ b/content/api/user-guide/2.4-adding.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.4 - Adding entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.5-deleting.html b/content/api/user-guide/2.5-deleting.html
index 21bbda6..d8b8829 100644
--- a/content/api/user-guide/2.5-deleting.html
+++ b/content/api/user-guide/2.5-deleting.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.5 - Deleting entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.6-modifying.html b/content/api/user-guide/2.6-modifying.html
index e98f305..e7be287 100644
--- a/content/api/user-guide/2.6-modifying.html
+++ b/content/api/user-guide/2.6-modifying.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.6 - Modifying entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.7-moving-renaming.html b/content/api/user-guide/2.7-moving-renaming.html
index c4199e2..a5d0661 100644
--- a/content/api/user-guide/2.7-moving-renaming.html
+++ b/content/api/user-guide/2.7-moving-renaming.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.7 - Moving an renaming entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.8-comparing.html b/content/api/user-guide/2.8-comparing.html
index bf61483..072e94d 100644
--- a/content/api/user-guide/2.8-comparing.html
+++ b/content/api/user-guide/2.8-comparing.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.8 - Comparing entries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/2.9-exception-management.html b/content/api/user-guide/2.9-exception-management.html
index 80eda52..485bd12 100644
--- a/content/api/user-guide/2.9-exception-management.html
+++ b/content/api/user-guide/2.9-exception-management.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.9 - Exception management &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3-advanced-ldap-api-usage.html b/content/api/user-guide/3-advanced-ldap-api-usage.html
index ab09632..d393a60 100644
--- a/content/api/user-guide/3-advanced-ldap-api-usage.html
+++ b/content/api/user-guide/3-advanced-ldap-api-usage.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Advanced LDAP API Usage &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.1-controls.html b/content/api/user-guide/3.1-controls.html
index 0d84f0d..72f6a25 100644
--- a/content/api/user-guide/3.1-controls.html
+++ b/content/api/user-guide/3.1-controls.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.1 - Controls &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.2-extended-operations.html b/content/api/user-guide/3.2-extended-operations.html
index 33b8d5b..196bbb0 100644
--- a/content/api/user-guide/3.2-extended-operations.html
+++ b/content/api/user-guide/3.2-extended-operations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.2 - Extended Operations &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.3-referrals.html b/content/api/user-guide/3.3-referrals.html
index 30cf62d..d393a18 100644
--- a/content/api/user-guide/3.3-referrals.html
+++ b/content/api/user-guide/3.3-referrals.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.3 - Referrals &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.4-aliases.html b/content/api/user-guide/3.4-aliases.html
index 255d857..43e9bb6 100644
--- a/content/api/user-guide/3.4-aliases.html
+++ b/content/api/user-guide/3.4-aliases.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.4 - Aliases &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.5-ldif-dsml.html b/content/api/user-guide/3.5-ldif-dsml.html
index 148c5c2..39d2426 100644
--- a/content/api/user-guide/3.5-ldif-dsml.html
+++ b/content/api/user-guide/3.5-ldif-dsml.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.5 - LDIF and DSML &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.6-abandonning.html b/content/api/user-guide/3.6-abandonning.html
index ad3fb43..dd81688 100644
--- a/content/api/user-guide/3.6-abandonning.html
+++ b/content/api/user-guide/3.6-abandonning.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.6 - Abandonning an operation &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/3.7-server-informations.html b/content/api/user-guide/3.7-server-informations.html
index a2f1084..b20317c 100644
--- a/content/api/user-guide/3.7-server-informations.html
+++ b/content/api/user-guide/3.7-server-informations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.7 - Server informations &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4-schema-management.html b/content/api/user-guide/4-schema-management.html
index b88bc04..6c56c5c 100644
--- a/content/api/user-guide/4-schema-management.html
+++ b/content/api/user-guide/4-schema-management.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Schema Management &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.1-schema.html b/content/api/user-guide/4.1-schema.html
index 5293a87..99f4da5 100644
--- a/content/api/user-guide/4.1-schema.html
+++ b/content/api/user-guide/4.1-schema.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.1 - Schema &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2-schema-manager.html b/content/api/user-guide/4.2-schema-manager.html
index ea27557..67f9906 100644
--- a/content/api/user-guide/4.2-schema-manager.html
+++ b/content/api/user-guide/4.2-schema-manager.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2 - Schema Manager &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1-schema-objects.html b/content/api/user-guide/4.2.1-schema-objects.html
index 1b1f1e7..e043a17 100644
--- a/content/api/user-guide/4.2.1-schema-objects.html
+++ b/content/api/user-guide/4.2.1-schema-objects.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1 - Schema Objects &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.1-attribute-types.html b/content/api/user-guide/4.2.1.1-attribute-types.html
index c6563ea..c84f81a 100644
--- a/content/api/user-guide/4.2.1.1-attribute-types.html
+++ b/content/api/user-guide/4.2.1.1-attribute-types.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.1 - AttributeTypes &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.2-object-classes.html b/content/api/user-guide/4.2.1.2-object-classes.html
index 05b9212..77e3ad7 100644
--- a/content/api/user-guide/4.2.1.2-object-classes.html
+++ b/content/api/user-guide/4.2.1.2-object-classes.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.2 - ObjectClasses &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.3-syntaxes.html b/content/api/user-guide/4.2.1.3-syntaxes.html
index 425f94f..9b63931 100644
--- a/content/api/user-guide/4.2.1.3-syntaxes.html
+++ b/content/api/user-guide/4.2.1.3-syntaxes.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.3 - Syntaxes &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.4-matching-rules.html b/content/api/user-guide/4.2.1.4-matching-rules.html
index 0be3ace..228388f 100644
--- a/content/api/user-guide/4.2.1.4-matching-rules.html
+++ b/content/api/user-guide/4.2.1.4-matching-rules.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.4 - MatchingRules &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.5-dit-content-rules.html b/content/api/user-guide/4.2.1.5-dit-content-rules.html
index 3c9ce28..59ba4ed 100644
--- a/content/api/user-guide/4.2.1.5-dit-content-rules.html
+++ b/content/api/user-guide/4.2.1.5-dit-content-rules.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.5 - DitContentRules &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.6-dit-structure-rules.html b/content/api/user-guide/4.2.1.6-dit-structure-rules.html
index db19bcb..0deb349 100644
--- a/content/api/user-guide/4.2.1.6-dit-structure-rules.html
+++ b/content/api/user-guide/4.2.1.6-dit-structure-rules.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.6 - DitStructureRules &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.7-matching-rule-uses.html b/content/api/user-guide/4.2.1.7-matching-rule-uses.html
index 1f234ee..d22dec4 100644
--- a/content/api/user-guide/4.2.1.7-matching-rule-uses.html
+++ b/content/api/user-guide/4.2.1.7-matching-rule-uses.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.7 - MatchingRuleUses &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.8-name-forms.html b/content/api/user-guide/4.2.1.8-name-forms.html
index f1ae7f3..90797c9 100644
--- a/content/api/user-guide/4.2.1.8-name-forms.html
+++ b/content/api/user-guide/4.2.1.8-name-forms.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.8 - NameForms &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html b/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html
index 26466f4..2a62cf8 100644
--- a/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html
+++ b/content/api/user-guide/4.2.1.9-apacheds-schema-elements.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.1.9 - ApacheDS Schema Element &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.2-registries.html b/content/api/user-guide/4.2.2-registries.html
index f027379..8f4ba77 100644
--- a/content/api/user-guide/4.2.2-registries.html
+++ b/content/api/user-guide/4.2.2-registries.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.2 - Registries &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/4.2.3-schema-loader.html b/content/api/user-guide/4.2.3-schema-loader.html
index f734018..39db0eb 100644
--- a/content/api/user-guide/4.2.3-schema-loader.html
+++ b/content/api/user-guide/4.2.3-schema-loader.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4.2.3 - SchemaLoader &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5-ldap-security.html b/content/api/user-guide/5-ldap-security.html
index ea7c988..015e4ef 100644
--- a/content/api/user-guide/5-ldap-security.html
+++ b/content/api/user-guide/5-ldap-security.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5 - LDAP Security &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.1-ldaps.html b/content/api/user-guide/5.1-ldaps.html
index be61a38..f71b787 100644
--- a/content/api/user-guide/5.1-ldaps.html
+++ b/content/api/user-guide/5.1-ldaps.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.1 - LDAPS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.2-start-tls.html b/content/api/user-guide/5.2-start-tls.html
index c3ba324..971e8d9 100644
--- a/content/api/user-guide/5.2-start-tls.html
+++ b/content/api/user-guide/5.2-start-tls.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.2 - StartTLS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.3-sasl-bind.html b/content/api/user-guide/5.3-sasl-bind.html
index 1fb035c..0743759 100644
--- a/content/api/user-guide/5.3-sasl-bind.html
+++ b/content/api/user-guide/5.3-sasl-bind.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.3 - SASL Bind &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.4-password-handling.html b/content/api/user-guide/5.4-password-handling.html
index fbc2948..3035c6f 100644
--- a/content/api/user-guide/5.4-password-handling.html
+++ b/content/api/user-guide/5.4-password-handling.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.4 - Password Handling &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.5-certificates.html b/content/api/user-guide/5.5-certificates.html
index 3a838c0..3156d85 100644
--- a/content/api/user-guide/5.5-certificates.html
+++ b/content/api/user-guide/5.5-certificates.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.5 - Certificates &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/5.6-aci-and-acls.html b/content/api/user-guide/5.6-aci-and-acls.html
index c145dc1..7d5c8ff 100644
--- a/content/api/user-guide/5.6-aci-and-acls.html
+++ b/content/api/user-guide/5.6-aci-and-acls.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5.6 - ACI and ACLs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6-ldap-data-structures.html b/content/api/user-guide/6-ldap-data-structures.html
index 05b8352..a74dfb6 100644
--- a/content/api/user-guide/6-ldap-data-structures.html
+++ b/content/api/user-guide/6-ldap-data-structures.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - LDAP Data Structures &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.1-administrative-point.html b/content/api/user-guide/6.1-administrative-point.html
index 9563773..b9c8fb2 100644
--- a/content/api/user-guide/6.1-administrative-point.html
+++ b/content/api/user-guide/6.1-administrative-point.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.1 - AdministrativePoint &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.10-dit-content-rule.html b/content/api/user-guide/6.10-dit-content-rule.html
index 230ef02..ff5667f 100644
--- a/content/api/user-guide/6.10-dit-content-rule.html
+++ b/content/api/user-guide/6.10-dit-content-rule.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.10 - DITContentRule &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.11-dit-structure-rule.html b/content/api/user-guide/6.11-dit-structure-rule.html
index 77d7495..ef08420 100644
--- a/content/api/user-guide/6.11-dit-structure-rule.html
+++ b/content/api/user-guide/6.11-dit-structure-rule.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.11 - DITStructureRule &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.12-entry.html b/content/api/user-guide/6.12-entry.html
index 0aacaf9..71bab03 100644
--- a/content/api/user-guide/6.12-entry.html
+++ b/content/api/user-guide/6.12-entry.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.12 - Entry &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.13-expr-node.html b/content/api/user-guide/6.13-expr-node.html
index 55aa88a..94a854b 100644
--- a/content/api/user-guide/6.13-expr-node.html
+++ b/content/api/user-guide/6.13-expr-node.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.13 - ExprNode &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.14-ldap-comparator.html b/content/api/user-guide/6.14-ldap-comparator.html
index 08c23dd..4a28978 100644
--- a/content/api/user-guide/6.14-ldap-comparator.html
+++ b/content/api/user-guide/6.14-ldap-comparator.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.14 - LdapComparator &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.15-ldap-result.html b/content/api/user-guide/6.15-ldap-result.html
index 6b89b09..98ed0a7 100644
--- a/content/api/user-guide/6.15-ldap-result.html
+++ b/content/api/user-guide/6.15-ldap-result.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.15 - LdapResult &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.16-ldap-syntax.html b/content/api/user-guide/6.16-ldap-syntax.html
index 2ab13bf..80422bf 100644
--- a/content/api/user-guide/6.16-ldap-syntax.html
+++ b/content/api/user-guide/6.16-ldap-syntax.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.16 - LdapSyntax &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.17-ldap-url.html b/content/api/user-guide/6.17-ldap-url.html
index a3c5c0e..fcba5b4 100644
--- a/content/api/user-guide/6.17-ldap-url.html
+++ b/content/api/user-guide/6.17-ldap-url.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.17 - LdapUrl &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.18-ldif-control.html b/content/api/user-guide/6.18-ldif-control.html
index 7a9c0bf..e9408d6 100644
--- a/content/api/user-guide/6.18-ldif-control.html
+++ b/content/api/user-guide/6.18-ldif-control.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.18 - LdifControl &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.19-ldif-entry.html b/content/api/user-guide/6.19-ldif-entry.html
index c510dd3..a5fab69 100644
--- a/content/api/user-guide/6.19-ldif-entry.html
+++ b/content/api/user-guide/6.19-ldif-entry.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.19 - LdifEntry &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.2-administrative-role.html b/content/api/user-guide/6.2-administrative-role.html
index 939896a..e04a199 100644
--- a/content/api/user-guide/6.2-administrative-role.html
+++ b/content/api/user-guide/6.2-administrative-role.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.2 - AdministrativeRole &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.20-matching-rule.html b/content/api/user-guide/6.20-matching-rule.html
index 6b859e1..28ab037 100644
--- a/content/api/user-guide/6.20-matching-rule.html
+++ b/content/api/user-guide/6.20-matching-rule.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.20 - MatchingRule &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.21-matching-rule-use.html b/content/api/user-guide/6.21-matching-rule-use.html
index 4ffd5ba..79bb949 100644
--- a/content/api/user-guide/6.21-matching-rule-use.html
+++ b/content/api/user-guide/6.21-matching-rule-use.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.21 - MatchingRuleUse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.22-message.html b/content/api/user-guide/6.22-message.html
index fce0df0..16636ce 100644
--- a/content/api/user-guide/6.22-message.html
+++ b/content/api/user-guide/6.22-message.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.22 - Message &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.23-modification.html b/content/api/user-guide/6.23-modification.html
index 0243ec4..27a1b73 100644
--- a/content/api/user-guide/6.23-modification.html
+++ b/content/api/user-guide/6.23-modification.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.23 - Modification &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.24-name-form.html b/content/api/user-guide/6.24-name-form.html
index 2afa14d..f139bb8 100644
--- a/content/api/user-guide/6.24-name-form.html
+++ b/content/api/user-guide/6.24-name-form.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.24 - NameForm &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.25-normalizer.html b/content/api/user-guide/6.25-normalizer.html
index 9f906b5..cbf249d 100644
--- a/content/api/user-guide/6.25-normalizer.html
+++ b/content/api/user-guide/6.25-normalizer.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.25 - Normalizer &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.26-object-class.html b/content/api/user-guide/6.26-object-class.html
index 04bf9a1..cb9b77d 100644
--- a/content/api/user-guide/6.26-object-class.html
+++ b/content/api/user-guide/6.26-object-class.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.26 - ObjectClass &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.27-oid.html b/content/api/user-guide/6.27-oid.html
index f095f1e..944b114 100644
--- a/content/api/user-guide/6.27-oid.html
+++ b/content/api/user-guide/6.27-oid.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.27 - Oid &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.28-rdn.html b/content/api/user-guide/6.28-rdn.html
index 85657f7..aef5a2c 100644
--- a/content/api/user-guide/6.28-rdn.html
+++ b/content/api/user-guide/6.28-rdn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.28 - Rdn &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.29-referral.html b/content/api/user-guide/6.29-referral.html
index d867b03..e3e1b96 100644
--- a/content/api/user-guide/6.29-referral.html
+++ b/content/api/user-guide/6.29-referral.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.29 - Referral &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.3-attribute.html b/content/api/user-guide/6.3-attribute.html
index 3d1767f..d74915d 100644
--- a/content/api/user-guide/6.3-attribute.html
+++ b/content/api/user-guide/6.3-attribute.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.3 - Attribute &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.30-refinment.html b/content/api/user-guide/6.30-refinment.html
index da6e505..9629d76 100644
--- a/content/api/user-guide/6.30-refinment.html
+++ b/content/api/user-guide/6.30-refinment.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.30 - Refinment &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.31-schema-manager.html b/content/api/user-guide/6.31-schema-manager.html
index 82d4637..91cfdd3 100644
--- a/content/api/user-guide/6.31-schema-manager.html
+++ b/content/api/user-guide/6.31-schema-manager.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.31 - SchemaManager &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.32-subentry.html b/content/api/user-guide/6.32-subentry.html
index 849ee80..2e7d739 100644
--- a/content/api/user-guide/6.32-subentry.html
+++ b/content/api/user-guide/6.32-subentry.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.32 - Subentry &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.33-subtree-specification.html b/content/api/user-guide/6.33-subtree-specification.html
index 15658c2..5ed5641 100644
--- a/content/api/user-guide/6.33-subtree-specification.html
+++ b/content/api/user-guide/6.33-subtree-specification.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.33 - SubtreeSpecification &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.34-syntax-checker.html b/content/api/user-guide/6.34-syntax-checker.html
index dfb9ef6..94a999b 100644
--- a/content/api/user-guide/6.34-syntax-checker.html
+++ b/content/api/user-guide/6.34-syntax-checker.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.34 - SyntaxChecker &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.35-value.html b/content/api/user-guide/6.35-value.html
index bf4ba6d..4cb37ea 100644
--- a/content/api/user-guide/6.35-value.html
+++ b/content/api/user-guide/6.35-value.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.35 - Value &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.4-attribute-type.html b/content/api/user-guide/6.4-attribute-type.html
index 4d72682..7a9335a 100644
--- a/content/api/user-guide/6.4-attribute-type.html
+++ b/content/api/user-guide/6.4-attribute-type.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.4 - AttributeType &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.5-ava.html b/content/api/user-guide/6.5-ava.html
index b154c17..b3e6ddc 100644
--- a/content/api/user-guide/6.5-ava.html
+++ b/content/api/user-guide/6.5-ava.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.5 - Ava &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.6-csn.html b/content/api/user-guide/6.6-csn.html
index 19eb722..66b69be 100644
--- a/content/api/user-guide/6.6-csn.html
+++ b/content/api/user-guide/6.6-csn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.6 - Csn &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.7-control.html b/content/api/user-guide/6.7-control.html
index ca88647..2964fe2 100644
--- a/content/api/user-guide/6.7-control.html
+++ b/content/api/user-guide/6.7-control.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.7 - Control &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.8-cursor.html b/content/api/user-guide/6.8-cursor.html
index 44f1a77..2bf129a 100644
--- a/content/api/user-guide/6.8-cursor.html
+++ b/content/api/user-guide/6.8-cursor.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.8 - Cursor &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/6.9-dn.html b/content/api/user-guide/6.9-dn.html
index 37f2643..cd7d9ac 100644
--- a/content/api/user-guide/6.9-dn.html
+++ b/content/api/user-guide/6.9-dn.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6.9 - Dn &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7-requests-responses.html b/content/api/user-guide/7-requests-responses.html
index 0827768..3cbe225 100644
--- a/content/api/user-guide/7-requests-responses.html
+++ b/content/api/user-guide/7-requests-responses.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7 - Requests and Responses &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.1-abandon-request.html b/content/api/user-guide/7.1-abandon-request.html
index c5e16d9..031164a 100644
--- a/content/api/user-guide/7.1-abandon-request.html
+++ b/content/api/user-guide/7.1-abandon-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.1 - AbandonRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.10-extended-request.html b/content/api/user-guide/7.10-extended-request.html
index f2ff97d..f5ba7a2 100644
--- a/content/api/user-guide/7.10-extended-request.html
+++ b/content/api/user-guide/7.10-extended-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.10 - ExtendedRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.11-extended-response.html b/content/api/user-guide/7.11-extended-response.html
index bc9f99b..c2ad49f 100644
--- a/content/api/user-guide/7.11-extended-response.html
+++ b/content/api/user-guide/7.11-extended-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.11 - ExtendedResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.12-intermediate-response.html b/content/api/user-guide/7.12-intermediate-response.html
index 9a99341..9f16eb7 100644
--- a/content/api/user-guide/7.12-intermediate-response.html
+++ b/content/api/user-guide/7.12-intermediate-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.12 - IntermediateResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.13-mod-dn-request.html b/content/api/user-guide/7.13-mod-dn-request.html
index 2ad3e5a..c3a430f 100644
--- a/content/api/user-guide/7.13-mod-dn-request.html
+++ b/content/api/user-guide/7.13-mod-dn-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.13 - ModDnRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.14-mod-dn-response.html b/content/api/user-guide/7.14-mod-dn-response.html
index 2e66115..d53aecd 100644
--- a/content/api/user-guide/7.14-mod-dn-response.html
+++ b/content/api/user-guide/7.14-mod-dn-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.14 - ModDnResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.15-modify-request.html b/content/api/user-guide/7.15-modify-request.html
index 1f0e528..3e964c9 100644
--- a/content/api/user-guide/7.15-modify-request.html
+++ b/content/api/user-guide/7.15-modify-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.15 - ModifyRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.16-modify-response.html b/content/api/user-guide/7.16-modify-response.html
index 976d894..c8b8213 100644
--- a/content/api/user-guide/7.16-modify-response.html
+++ b/content/api/user-guide/7.16-modify-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.16 - ModifyResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.17-search-request.html b/content/api/user-guide/7.17-search-request.html
index dfea9c4..d030f00 100644
--- a/content/api/user-guide/7.17-search-request.html
+++ b/content/api/user-guide/7.17-search-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.17 - SearchRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.18-search-result-done.html b/content/api/user-guide/7.18-search-result-done.html
index e155cd7..44393b4 100644
--- a/content/api/user-guide/7.18-search-result-done.html
+++ b/content/api/user-guide/7.18-search-result-done.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.18 - SearchResultDone &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.19-search-result-entry.html b/content/api/user-guide/7.19-search-result-entry.html
index 8c515db..933344c 100644
--- a/content/api/user-guide/7.19-search-result-entry.html
+++ b/content/api/user-guide/7.19-search-result-entry.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.19 - SearchResultEntry &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.2-add-request.html b/content/api/user-guide/7.2-add-request.html
index df70616..e77ea7f 100644
--- a/content/api/user-guide/7.2-add-request.html
+++ b/content/api/user-guide/7.2-add-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.2 - AddRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.20-search-result-reference.html b/content/api/user-guide/7.20-search-result-reference.html
index 0c0ffa1..1838c7f 100644
--- a/content/api/user-guide/7.20-search-result-reference.html
+++ b/content/api/user-guide/7.20-search-result-reference.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.20 - SearchResultReference &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.21-unbind-request.html b/content/api/user-guide/7.21-unbind-request.html
index 14dbcfe..a047ee2 100644
--- a/content/api/user-guide/7.21-unbind-request.html
+++ b/content/api/user-guide/7.21-unbind-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.21 - UnbindRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.3-add-response.html b/content/api/user-guide/7.3-add-response.html
index 1da80fc..35c4ffa 100644
--- a/content/api/user-guide/7.3-add-response.html
+++ b/content/api/user-guide/7.3-add-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.3 - AddResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.4-bind-request.html b/content/api/user-guide/7.4-bind-request.html
index d0dae8c..26fa72d 100644
--- a/content/api/user-guide/7.4-bind-request.html
+++ b/content/api/user-guide/7.4-bind-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.4 - BindRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.5-bind-response.html b/content/api/user-guide/7.5-bind-response.html
index 67a8c96..e81fbb8 100644
--- a/content/api/user-guide/7.5-bind-response.html
+++ b/content/api/user-guide/7.5-bind-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.5 - BindResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.6-compare-request.html b/content/api/user-guide/7.6-compare-request.html
index 54cdf11..04a0522 100644
--- a/content/api/user-guide/7.6-compare-request.html
+++ b/content/api/user-guide/7.6-compare-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.6 - CompareRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.7-compare-response.html b/content/api/user-guide/7.7-compare-response.html
index 7434546..babd8b8 100644
--- a/content/api/user-guide/7.7-compare-response.html
+++ b/content/api/user-guide/7.7-compare-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.7 - CompareResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.8-del-request.html b/content/api/user-guide/7.8-del-request.html
index 1b01456..3e6c0cb 100644
--- a/content/api/user-guide/7.8-del-request.html
+++ b/content/api/user-guide/7.8-del-request.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.8 - DelRequest &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/7.9-del-response.html b/content/api/user-guide/7.9-del-response.html
index dba7462..f5d94e6 100644
--- a/content/api/user-guide/7.9-del-response.html
+++ b/content/api/user-guide/7.9-del-response.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.9 - DelResponse &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/user-guide/8-ldap-rfcs.html b/content/api/user-guide/8-ldap-rfcs.html
index a26f7c9..62b9ac7 100644
--- a/content/api/user-guide/8-ldap-rfcs.html
+++ b/content/api/user-guide/8-ldap-rfcs.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>8 - LDAP Related RFCs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/api/vision.html b/content/api/vision.html
index ff60639..e05d72c 100644
--- a/content/api/vision.html
+++ b/content/api/vision.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>LDAP API - Vision &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/articles.html b/content/articles.html
index e3172ef..ac39264 100644
--- a/content/articles.html
+++ b/content/articles.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Articles &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/commercial-support.html b/content/commercial-support.html
index ea30f2c..0ebf526 100644
--- a/content/commercial-support.html
+++ b/content/commercial-support.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Commercial support &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/conference-materials.html b/content/conference-materials.html
index 373720c..4bd7c6c 100644
--- a/content/conference-materials.html
+++ b/content/conference-materials.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Conference Materials &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/contribute.html b/content/contribute.html
index fe33fb7..a362bf4 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Contribute &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress.html b/content/fortress.html
index e3c905f..b95dbaa 100644
--- a/content/fortress.html
+++ b/content/fortress.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Fortresses &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/coding-standards.html b/content/fortress/coding-standards.html
index 6a6e32c..6f048bc 100644
--- a/content/fortress/coding-standards.html
+++ b/content/fortress/coding-standards.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Coding Standards &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/developer-guide.html b/content/fortress/developer-guide.html
index 264b188..f08d34e 100644
--- a/content/fortress/developer-guide.html
+++ b/content/fortress/developer-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Developer Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/download-old-versions.html b/content/fortress/download-old-versions.html
index 2096281..e3c9a53 100644
--- a/content/fortress/download-old-versions.html
+++ b/content/fortress/download-old-versions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download Old Versions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/download/download-archive.html b/content/fortress/download/download-archive.html
index 7445841..945ad68 100644
--- a/content/fortress/download/download-archive.html
+++ b/content/fortress/download/download-archive.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/download/download-sources.html b/content/fortress/download/download-sources.html
index aff2aa3..ead6043 100644
--- a/content/fortress/download/download-sources.html
+++ b/content/fortress/download/download-sources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/downloads.html b/content/fortress/downloads.html
index 26e5e92..ba21944 100644
--- a/content/fortress/downloads.html
+++ b/content/fortress/downloads.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Fortress Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/history.html b/content/fortress/history.html
index f12331c..57e7c50 100644
--- a/content/fortress/history.html
+++ b/content/fortress/history.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>History &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/index.html b/content/fortress/index.html
index c5c74da..5f461a4 100644
--- a/content/fortress/index.html
+++ b/content/fortress/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to Apache Fortress &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation.html b/content/fortress/installation.html
index 6c17530..5dd16da 100644
--- a/content/fortress/installation.html
+++ b/content/fortress/installation.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Fortress Installation guides &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds.html b/content/fortress/installation/apacheds.html
index bee489f..93e06c8 100644
--- a/content/fortress/installation/apacheds.html
+++ b/content/fortress/installation/apacheds.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>ApacheDS Installation guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/apacheds.html b/content/fortress/installation/apacheds/apacheds.html
index fe37151..a99789e 100644
--- a/content/fortress/installation/apacheds/apacheds.html
+++ b/content/fortress/installation/apacheds/apacheds.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Quick start guide for ApacheDS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/guidelines.html b/content/fortress/installation/apacheds/guidelines.html
index 744c1ac..22a552d 100644
--- a/content/fortress/installation/apacheds/guidelines.html
+++ b/content/fortress/installation/apacheds/guidelines.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Guidelines and Tips for first-time users &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/prerequisites.html b/content/fortress/installation/apacheds/prerequisites.html
index e1ce872..c8c1ea4 100644
--- a/content/fortress/installation/apacheds/prerequisites.html
+++ b/content/fortress/installation/apacheds/prerequisites.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>System Prequesites &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-I.html b/content/fortress/installation/apacheds/section-I.html
index 7d49b2c..e97f789 100644
--- a/content/fortress/installation/apacheds/section-I.html
+++ b/content/fortress/installation/apacheds/section-I.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section I - Instructions to extract and configure Fortress Builder Package &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-II.html b/content/fortress/installation/apacheds/section-II.html
index ab5f8a8..f9f4410 100644
--- a/content/fortress/installation/apacheds/section-II.html
+++ b/content/fortress/installation/apacheds/section-II.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section II - Instructions to run the Fortress Ant Build &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-III.html b/content/fortress/installation/apacheds/section-III.html
index d742932..605b2b6 100644
--- a/content/fortress/installation/apacheds/section-III.html
+++ b/content/fortress/installation/apacheds/section-III.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section III - Instructions to configure ApacheDS and load with seed data &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-IV.html b/content/fortress/installation/apacheds/section-IV.html
index 854275f..17c15a4 100644
--- a/content/fortress/installation/apacheds/section-IV.html
+++ b/content/fortress/installation/apacheds/section-IV.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IV - Instructions to regression test Fortress and ApacheDS &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-IX.html b/content/fortress/installation/apacheds/section-IX.html
index e4eb6ff..13a10db 100644
--- a/content/fortress/installation/apacheds/section-IX.html
+++ b/content/fortress/installation/apacheds/section-IX.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IX - Instructions to regression test EnMasse Policy server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-V.html b/content/fortress/installation/apacheds/section-V.html
index c38f39d..8cebb83 100644
--- a/content/fortress/installation/apacheds/section-V.html
+++ b/content/fortress/installation/apacheds/section-V.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section V - Instructions to run the Fortress Command Line Interpreter (CLI) utility &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-VI.html b/content/fortress/installation/apacheds/section-VI.html
index 4117c14..9deaa35 100644
--- a/content/fortress/installation/apacheds/section-VI.html
+++ b/content/fortress/installation/apacheds/section-VI.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VI - Instructions to run Fortress Console &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-VII.html b/content/fortress/installation/apacheds/section-VII.html
index d827eb1..e2b454b 100644
--- a/content/fortress/installation/apacheds/section-VII.html
+++ b/content/fortress/installation/apacheds/section-VII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VII - Instructions to generate and view Javadoc &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-VIII.html b/content/fortress/installation/apacheds/section-VIII.html
index 7716419..305f9c5 100644
--- a/content/fortress/installation/apacheds/section-VIII.html
+++ b/content/fortress/installation/apacheds/section-VIII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VIII - Instructions to install EnMasse Policy Server Demo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/apacheds/section-X.html b/content/fortress/installation/apacheds/section-X.html
index bde9f7a..15cb0b5 100644
--- a/content/fortress/installation/apacheds/section-X.html
+++ b/content/fortress/installation/apacheds/section-X.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section X - More Utilities &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/guidelines.html b/content/fortress/installation/linux/guidelines.html
index eb212ac..94b50f2 100644
--- a/content/fortress/installation/linux/guidelines.html
+++ b/content/fortress/installation/linux/guidelines.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Guidelines and Tips for first-time users &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/linux.html b/content/fortress/installation/linux/linux.html
index 88a501d..6137017 100644
--- a/content/fortress/installation/linux/linux.html
+++ b/content/fortress/installation/linux/linux.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Quick start guide for Linux &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/prerequisites.html b/content/fortress/installation/linux/prerequisites.html
index 5dd9d8c..95f43d4 100644
--- a/content/fortress/installation/linux/prerequisites.html
+++ b/content/fortress/installation/linux/prerequisites.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>System Prequesites &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-I.html b/content/fortress/installation/linux/section-I.html
index 27736bf..5434fa0 100644
--- a/content/fortress/installation/linux/section-I.html
+++ b/content/fortress/installation/linux/section-I.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section I - Instructions to download, extract and configure Fortress &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-II.html b/content/fortress/installation/linux/section-II.html
index 9cea4f4..e68f960 100644
--- a/content/fortress/installation/linux/section-II.html
+++ b/content/fortress/installation/linux/section-II.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section II - Instructions to run the Fortress Ant Build &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-III.html b/content/fortress/installation/linux/section-III.html
index aaaa821..4d02a85 100644
--- a/content/fortress/installation/linux/section-III.html
+++ b/content/fortress/installation/linux/section-III.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section III - Instructions to run the Builder to Install OpenLDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-IV.html b/content/fortress/installation/linux/section-IV.html
index c68367f..f697008 100644
--- a/content/fortress/installation/linux/section-IV.html
+++ b/content/fortress/installation/linux/section-IV.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IV - Instructions to regression test Fortress and OpenLDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-IX.html b/content/fortress/installation/linux/section-IX.html
index 07c46a9..09fcf13 100644
--- a/content/fortress/installation/linux/section-IX.html
+++ b/content/fortress/installation/linux/section-IX.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IX - Instructions to run Fortress Console &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-V.html b/content/fortress/installation/linux/section-V.html
index 57ffd47..73be4f5 100644
--- a/content/fortress/installation/linux/section-V.html
+++ b/content/fortress/installation/linux/section-V.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section V - Instructions to install Commander Web UI Demo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-VI.html b/content/fortress/installation/linux/section-VI.html
index 2d26644..d0c3200 100644
--- a/content/fortress/installation/linux/section-VI.html
+++ b/content/fortress/installation/linux/section-VI.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VI - Instructions to test Commander Web UI Demo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-VII.html b/content/fortress/installation/linux/section-VII.html
index d70ae17..31606cf 100644
--- a/content/fortress/installation/linux/section-VII.html
+++ b/content/fortress/installation/linux/section-VII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VII - Instructions to connect to Commander Web Admin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-VIII.html b/content/fortress/installation/linux/section-VIII.html
index e64df3d..6256f53 100644
--- a/content/fortress/installation/linux/section-VIII.html
+++ b/content/fortress/installation/linux/section-VIII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VIII - Instructions to run the Fortress Command Line Interpreter &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-X.html b/content/fortress/installation/linux/section-X.html
index f75c650..5f26b7c 100644
--- a/content/fortress/installation/linux/section-X.html
+++ b/content/fortress/installation/linux/section-X.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section X - Instructions to generate and view Javadoc &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-XI.html b/content/fortress/installation/linux/section-XI.html
index c430db7..63a35cf 100644
--- a/content/fortress/installation/linux/section-XI.html
+++ b/content/fortress/installation/linux/section-XI.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XI - Instructions to install EnMasse Policy Server Demo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-XII.html b/content/fortress/installation/linux/section-XII.html
index cb64507..ad6e32f 100644
--- a/content/fortress/installation/linux/section-XII.html
+++ b/content/fortress/installation/linux/section-XII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XII - Instructions to regression test EnMasse Policy server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-XIII.html b/content/fortress/installation/linux/section-XIII.html
index cea47e5..e0f8040 100644
--- a/content/fortress/installation/linux/section-XIII.html
+++ b/content/fortress/installation/linux/section-XIII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XIII - Instructions to enable RBAC Accelerator Overlay in OpenLDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/linux/section-XIV.html b/content/fortress/installation/linux/section-XIV.html
index fba5f36..c864826 100644
--- a/content/fortress/installation/linux/section-XIV.html
+++ b/content/fortress/installation/linux/section-XIV.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XIV - More Utilities &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/openldap.html b/content/fortress/installation/openldap.html
index 055cc91..6ba04da 100644
--- a/content/fortress/installation/openldap.html
+++ b/content/fortress/installation/openldap.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Installation guides &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/guidelines.html b/content/fortress/installation/windows/guidelines.html
index cb10373..1bd0b24 100644
--- a/content/fortress/installation/windows/guidelines.html
+++ b/content/fortress/installation/windows/guidelines.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Guidelines and Tips for first-time users &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/prequesites.html b/content/fortress/installation/windows/prequesites.html
index 5080f4d..686f42e 100644
--- a/content/fortress/installation/windows/prequesites.html
+++ b/content/fortress/installation/windows/prequesites.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>System Prequesites &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-I.html b/content/fortress/installation/windows/section-I.html
index 9c7663b..66dcb94 100644
--- a/content/fortress/installation/windows/section-I.html
+++ b/content/fortress/installation/windows/section-I.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section I - Instructions to extract and configure Fortress Builder Package &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-II.html b/content/fortress/installation/windows/section-II.html
index 68cf6af..6a8f906 100644
--- a/content/fortress/installation/windows/section-II.html
+++ b/content/fortress/installation/windows/section-II.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section II - Instructions to run the Fortress Ant Build &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-III.html b/content/fortress/installation/windows/section-III.html
index 940f2e7..c3b7962 100644
--- a/content/fortress/installation/windows/section-III.html
+++ b/content/fortress/installation/windows/section-III.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section III - Instructions to run the Builder to Install OpenLDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-IV.html b/content/fortress/installation/windows/section-IV.html
index 464553f..bd31de2 100644
--- a/content/fortress/installation/windows/section-IV.html
+++ b/content/fortress/installation/windows/section-IV.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IV - Instructions to regression test Fortress and OpenLDAP &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-IX.html b/content/fortress/installation/windows/section-IX.html
index 95b91d7..124a145 100644
--- a/content/fortress/installation/windows/section-IX.html
+++ b/content/fortress/installation/windows/section-IX.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section IX - Instructions to run Fortress Console &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-V.html b/content/fortress/installation/windows/section-V.html
index eda7d14..91af06e 100644
--- a/content/fortress/installation/windows/section-V.html
+++ b/content/fortress/installation/windows/section-V.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section V - Instructions to install Commander Web UI Demo (optional) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-VI.html b/content/fortress/installation/windows/section-VI.html
index cb0b490..9d5775a 100644
--- a/content/fortress/installation/windows/section-VI.html
+++ b/content/fortress/installation/windows/section-VI.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VI - Instructions to automatically test Commander Web UI Demo (optional) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-VII.html b/content/fortress/installation/windows/section-VII.html
index a342037..2000d1c 100644
--- a/content/fortress/installation/windows/section-VII.html
+++ b/content/fortress/installation/windows/section-VII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VII - Instructions to connect to Commander Web Admin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-VIII.html b/content/fortress/installation/windows/section-VIII.html
index 8b3a4a2..8915a45 100644
--- a/content/fortress/installation/windows/section-VIII.html
+++ b/content/fortress/installation/windows/section-VIII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section VIII - Instructions to run the Fortress Command Line Interpreter (CLI) &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-X.html b/content/fortress/installation/windows/section-X.html
index 89d1f1f..fedf298 100644
--- a/content/fortress/installation/windows/section-X.html
+++ b/content/fortress/installation/windows/section-X.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section X - Instructions to generate and view Javadoc &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-XI.html b/content/fortress/installation/windows/section-XI.html
index bb10dd5..21af7d2 100644
--- a/content/fortress/installation/windows/section-XI.html
+++ b/content/fortress/installation/windows/section-XI.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XI - Instructions to install EnMasse Policy Server Demo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-XII.html b/content/fortress/installation/windows/section-XII.html
index 153819c..fd12250 100644
--- a/content/fortress/installation/windows/section-XII.html
+++ b/content/fortress/installation/windows/section-XII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XII - Instructions to regression test EnMasse Policy server &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/section-XIII.html b/content/fortress/installation/windows/section-XIII.html
index d5c2059..0b0f607 100644
--- a/content/fortress/installation/windows/section-XIII.html
+++ b/content/fortress/installation/windows/section-XIII.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Section XIII - More Utilities &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/installation/windows/windows.html b/content/fortress/installation/windows/windows.html
index c78ae13..f6291ae 100644
--- a/content/fortress/installation/windows/windows.html
+++ b/content/fortress/installation/windows/windows.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Quick start guide for Windows &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/issues.html b/content/fortress/issues.html
index 99c5881..7a61e34 100644
--- a/content/fortress/issues.html
+++ b/content/fortress/issues.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Issues &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/news.html b/content/fortress/news.html
index aef47b6..e02db39 100644
--- a/content/fortress/news.html
+++ b/content/fortress/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/overview.html b/content/fortress/overview.html
index 0a04b72..5224d2b 100644
--- a/content/fortress/overview.html
+++ b/content/fortress/overview.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Fortress Overview &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/testimonials.html b/content/fortress/testimonials.html
index e744154..40d40ca 100644
--- a/content/fortress/testimonials.html
+++ b/content/fortress/testimonials.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Testimonials &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide.html b/content/fortress/user-guide.html
index 295e7c4..5d8bfdc 100644
--- a/content/fortress/user-guide.html
+++ b/content/fortress/user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>User&#39;s Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1-intro-rbac.html b/content/fortress/user-guide/1-intro-rbac.html
index b94b153..6e76ceb 100644
--- a/content/fortress/user-guide/1-intro-rbac.html
+++ b/content/fortress/user-guide/1-intro-rbac.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - An Introduction to Role-Based Access Control ANSI INCITS 359-2004 &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.1-rbac-explained.html b/content/fortress/user-guide/1.1-rbac-explained.html
index 9e95110..514ed4e 100644
--- a/content/fortress/user-guide/1.1-rbac-explained.html
+++ b/content/fortress/user-guide/1.1-rbac-explained.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - ANSI RBAC Explained &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.2-what-is-not-rbac.html b/content/fortress/user-guide/1.2-what-is-not-rbac.html
index 1058efa..f7fc156 100644
--- a/content/fortress/user-guide/1.2-what-is-not-rbac.html
+++ b/content/fortress/user-guide/1.2-what-is-not-rbac.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.2 - What ANSI RBAC is not &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.3-what-rbac-is.html b/content/fortress/user-guide/1.3-what-rbac-is.html
index 5b0904c..fd77339 100644
--- a/content/fortress/user-guide/1.3-what-rbac-is.html
+++ b/content/fortress/user-guide/1.3-what-rbac-is.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.3 - What ANSI RBAC is &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.4-why-rbac-is-important.html b/content/fortress/user-guide/1.4-why-rbac-is-important.html
index 8f7120f..de2b2a0 100644
--- a/content/fortress/user-guide/1.4-why-rbac-is-important.html
+++ b/content/fortress/user-guide/1.4-why-rbac-is-important.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.4 - Why is ANSI RBAC Important? &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.5-how-to-impl-rbac.html b/content/fortress/user-guide/1.5-how-to-impl-rbac.html
index 459cbfb..32fe9a1 100644
--- a/content/fortress/user-guide/1.5-how-to-impl-rbac.html
+++ b/content/fortress/user-guide/1.5-how-to-impl-rbac.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.5 - How to implement ANSI RBAC &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/1.6-go-for-more.html b/content/fortress/user-guide/1.6-go-for-more.html
index de42301..ec7f3ad 100644
--- a/content/fortress/user-guide/1.6-go-for-more.html
+++ b/content/fortress/user-guide/1.6-go-for-more.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.6 - Where to go for more info &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/2-multitenancy.html b/content/fortress/user-guide/2-multitenancy.html
index 825ad91..ad6321a 100644
--- a/content/fortress/user-guide/2-multitenancy.html
+++ b/content/fortress/user-guide/2-multitenancy.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Multitenancy &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/2.1-fortress-multitenancy.html b/content/fortress/user-guide/2.1-fortress-multitenancy.html
index f38e5e0..d870f6e 100644
--- a/content/fortress/user-guide/2.1-fortress-multitenancy.html
+++ b/content/fortress/user-guide/2.1-fortress-multitenancy.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - Fortress Multitenancy &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/2.2-tradi-multi-instances.html b/content/fortress/user-guide/2.2-tradi-multi-instances.html
index f9bec5c..810d632 100644
--- a/content/fortress/user-guide/2.2-tradi-multi-instances.html
+++ b/content/fortress/user-guide/2.2-tradi-multi-instances.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2 - Traditional Multi-Instances architecture &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/2.3-multitenancy-under-covers.html b/content/fortress/user-guide/2.3-multitenancy-under-covers.html
index c993618..dfe2c00 100644
--- a/content/fortress/user-guide/2.3-multitenancy-under-covers.html
+++ b/content/fortress/user-guide/2.3-multitenancy-under-covers.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - Multitenancy under the covers &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/user-guide/3-configuration.html b/content/fortress/user-guide/3-configuration.html
index 8202d71..9f60b08 100644
--- a/content/fortress/user-guide/3-configuration.html
+++ b/content/fortress/user-guide/3-configuration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Fortress Configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/fortress/vision.html b/content/fortress/vision.html
index 3367c76..7957d4d 100644
--- a/content/fortress/vision.html
+++ b/content/fortress/vision.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Vision &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/fortress-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/index.html b/content/index.html
index 73fc9d3..7043f87 100644
--- a/content/index.html
+++ b/content/index.html
@@ -3,13 +3,15 @@
 <html lang="en">
 <head>
 	<meta name="generator" content="Hugo 0.63.2" />
+    <meta charset="utf-8">
     <title>Welcome to Apache Directory &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/index.xml b/content/index.xml
index bd160c4..1b339e1 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -3108,7 +3108,7 @@ LDAP is a complex set of technology, Apache Directory Server is offering more th
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://directory.apache.org/studio/changelog.html</guid>
-      <description>ChangeLog Apache Directory Studio Version 2.0.0-M14 (September 8th 2018)  DIRSTUDIO-987 - strange behaviour with multi-valued RDN DIRSTUDIO-1057 - Update site doesn&amp;rsquo;t work with https DIRSTUDIO-1140 - Apple Sierra shows corrupted app when launching Studio DIRSTUDIO-1148 - IOConsole Updater - An internal error has occurred.Java heap space DIRSTUDIO-1151 - DN with backslash not displayed DIRSTUDIO-1157 - Values cannot be modified by text editor DIRSTUDIO-1163 -  [...]
+      <description>ChangeLog Apache Directory Studio Version 2.0.0-M15 (April 19th 2020) Bugs  DIRSTUDIO-1160 - Attributes silently dropped and not imported when import LDIF and provider is Apache Directory LDAP API DIRSTUDIO-1194 - build looks outside of repo (extra &amp;ldquo;..&amp;quot;) DIRSTUDIO-1195 - LDIF editor, entry editor, search result edtor fail to open with ClassCastException DIRSTUDIO-1197 - Connection Network check fails when using the LDAP API DIRSTUDIO-1199 - 2.0.0-M14 [...]
     </item>
     
     <item>
@@ -3933,7 +3933,7 @@ Mavibot is a Multi Version Concurrency Control (MVCC) BTree in Java. It is expec
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://directory.apache.org/studio/news.html</guid>
-      <description>News Apache Directory Studio 2.0-0-M14 released posted on September 8th, 2018 The Apache Directory Team is pleased to announce the release of Apache Directory Studio 2.0.0-M14, the next milestone release of the version 2.0 of its Eclipse based LDAP Browser and Directory client.
+      <description>News Apache Directory Studio 2.0-0-M15 released posted on April 19th, 2020 The Apache Directory Team is pleased to announce the release of Apache Directory Studio 2.0.0-M15, the next milestone release of the version 2.0 of its Eclipse based LDAP Browser and Directory client.
 You can download Apache Directory Studio 2.0.0-M14 as a standalone RCP application for Mac OS X, Linux and Windows here: https://directory.apache.org/studio/downloads.html
 You can also install it directly in Eclipse using this update site: https://directory.</description>
     </item>
diff --git a/content/issue-tracking.html b/content/issue-tracking.html
index 833ca8e..331e710 100644
--- a/content/issue-tracking.html
+++ b/content/issue-tracking.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Issue Tracking &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby.html b/content/kerby.html
index 9e29491..352e7d3 100644
--- a/content/kerby.html
+++ b/content/kerby.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerbies &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/developer-guide.html b/content/kerby/developer-guide.html
index bd8ea39..e393351 100644
--- a/content/kerby/developer-guide.html
+++ b/content/kerby/developer-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Developer&#39;s Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/download-old-versions.html b/content/kerby/download-old-versions.html
index f748c13..f0c7010 100644
--- a/content/kerby/download-old-versions.html
+++ b/content/kerby/download-old-versions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download Old Versions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/download/download-archive.html b/content/kerby/download/download-archive.html
index 1e0b896..0252fd5 100644
--- a/content/kerby/download/download-archive.html
+++ b/content/kerby/download/download-archive.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/download/download-sources.html b/content/kerby/download/download-sources.html
index f0ebfce..b8cb185 100644
--- a/content/kerby/download/download-sources.html
+++ b/content/kerby/download/download-sources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/downloads.html b/content/kerby/downloads.html
index 77af946..679dda6 100644
--- a/content/kerby/downloads.html
+++ b/content/kerby/downloads.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerby Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/features.html b/content/kerby/features.html
index e837b29..0516c6a 100644
--- a/content/kerby/features.html
+++ b/content/kerby/features.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Features &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/index.html b/content/kerby/index.html
index f7e3967..8e4224a 100644
--- a/content/kerby/index.html
+++ b/content/kerby/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to Apache Kerby &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/issues.html b/content/kerby/issues.html
index a4cb34e..731916c 100644
--- a/content/kerby/issues.html
+++ b/content/kerby/issues.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerby Issues &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/kerby-asn1.html b/content/kerby/kerby-asn1.html
index ffd225d..07feb6c 100644
--- a/content/kerby/kerby-asn1.html
+++ b/content/kerby/kerby-asn1.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerby ASN1 &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/news.html b/content/kerby/news.html
index bae74e3..b5a21af 100644
--- a/content/kerby/news.html
+++ b/content/kerby/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/overview.html b/content/kerby/overview.html
index aaf83f0..a8d04bf 100644
--- a/content/kerby/overview.html
+++ b/content/kerby/overview.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Overview &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/tutorials.html b/content/kerby/tutorials.html
index 0fb66b1..ec1c2d8 100644
--- a/content/kerby/tutorials.html
+++ b/content/kerby/tutorials.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Tutorials &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide.html b/content/kerby/user-guide.html
index cfc206b..085bb7d 100644
--- a/content/kerby/user-guide.html
+++ b/content/kerby/user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerby User&#39;s Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/1-how-to-begin.html b/content/kerby/user-guide/1-how-to-begin.html
index 0b574b3..03414a1 100644
--- a/content/kerby/user-guide/1-how-to-begin.html
+++ b/content/kerby/user-guide/1-how-to-begin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - How To Begin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/2-kerberos-library.html b/content/kerby/user-guide/2-kerberos-library.html
index aab323a..5c74d36 100644
--- a/content/kerby/user-guide/2-kerberos-library.html
+++ b/content/kerby/user-guide/2-kerberos-library.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - Kerberos library &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/2.1-krbclient-apis.html b/content/kerby/user-guide/2.1-krbclient-apis.html
index 0d0bc27..24e5129 100644
--- a/content/kerby/user-guide/2.1-krbclient-apis.html
+++ b/content/kerby/user-guide/2.1-krbclient-apis.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.1 - KrbClient APIs &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/2.2-kadmin.html b/content/kerby/user-guide/2.2-kadmin.html
index 76f1e0f..44d8957 100644
--- a/content/kerby/user-guide/2.2-kadmin.html
+++ b/content/kerby/user-guide/2.2-kadmin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.2 - Kadmin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/2.3-kdcserver.html b/content/kerby/user-guide/2.3-kdcserver.html
index 3e8f547..8ffd8b5 100644
--- a/content/kerby/user-guide/2.3-kdcserver.html
+++ b/content/kerby/user-guide/2.3-kdcserver.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.3 - KdcServer &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/2.4-simplekdcserver.html b/content/kerby/user-guide/2.4-simplekdcserver.html
index 105b635..21fba0a 100644
--- a/content/kerby/user-guide/2.4-simplekdcserver.html
+++ b/content/kerby/user-guide/2.4-simplekdcserver.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2.4 - SimpleKdcServer &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/3-tools.html b/content/kerby/user-guide/3-tools.html
index 5c49604..a0c94d9 100644
--- a/content/kerby/user-guide/3-tools.html
+++ b/content/kerby/user-guide/3-tools.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Tools &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/3.1-kdcinit.html b/content/kerby/user-guide/3.1-kdcinit.html
index 2f8553f..fe4b3a0 100644
--- a/content/kerby/user-guide/3.1-kdcinit.html
+++ b/content/kerby/user-guide/3.1-kdcinit.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.1 - kdcinit &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/3.2-kadmin.html b/content/kerby/user-guide/3.2-kadmin.html
index 30bfefc..0269721 100644
--- a/content/kerby/user-guide/3.2-kadmin.html
+++ b/content/kerby/user-guide/3.2-kadmin.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.2 - kadmin &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/3.3-kinit.html b/content/kerby/user-guide/3.3-kinit.html
index 0b0c106..b98fe84 100644
--- a/content/kerby/user-guide/3.3-kinit.html
+++ b/content/kerby/user-guide/3.3-kinit.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.3 - kinit &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/3.4-klist.html b/content/kerby/user-guide/3.4-klist.html
index e591264..e355c8c 100644
--- a/content/kerby/user-guide/3.4-klist.html
+++ b/content/kerby/user-guide/3.4-klist.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3.4 - klist &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/4-identity-backend.html b/content/kerby/user-guide/4-identity-backend.html
index 697f2b1..3ba22b1 100644
--- a/content/kerby/user-guide/4-identity-backend.html
+++ b/content/kerby/user-guide/4-identity-backend.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Identity Backend &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/5-crypto-and-encryption-types.html b/content/kerby/user-guide/5-crypto-and-encryption-types.html
index ca3be90..8b61537 100644
--- a/content/kerby/user-guide/5-crypto-and-encryption-types.html
+++ b/content/kerby/user-guide/5-crypto-and-encryption-types.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>5 - Kerberos Crypto and Encryption Types &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/6-network-support.html b/content/kerby/user-guide/6-network-support.html
index c13acd6..3fe9c06 100644
--- a/content/kerby/user-guide/6-network-support.html
+++ b/content/kerby/user-guide/6-network-support.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - Network Support &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/user-guide/7-dependency.html b/content/kerby/user-guide/7-dependency.html
index eb87e7a..3761ed9 100644
--- a/content/kerby/user-guide/7-dependency.html
+++ b/content/kerby/user-guide/7-dependency.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7 - Dependency &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/kerby/vision.html b/content/kerby/vision.html
index 2aa7534..4c558e0 100644
--- a/content/kerby/vision.html
+++ b/content/kerby/vision.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Kerby - Vision &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/orange.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mailing-lists-and-irc.html b/content/mailing-lists-and-irc.html
index c5259fb..968c878 100644
--- a/content/mailing-lists-and-irc.html
+++ b/content/mailing-lists-and-irc.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Mailing lists and IRC &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot.html b/content/mavibot.html
index 82ceefc..f98057d 100644
--- a/content/mavibot.html
+++ b/content/mavibot.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Mavibots &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/coding-standards.html b/content/mavibot/coding-standards.html
index ac7d816..a479d16 100644
--- a/content/mavibot/coding-standards.html
+++ b/content/mavibot/coding-standards.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Mavibot Coding Standards &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/developer-guide.html b/content/mavibot/developer-guide.html
index 553c231..79a4f0e 100644
--- a/content/mavibot/developer-guide.html
+++ b/content/mavibot/developer-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Mavibot Developers Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/download-old-versions.html b/content/mavibot/download-old-versions.html
index 6540972..3c067f7 100644
--- a/content/mavibot/download-old-versions.html
+++ b/content/mavibot/download-old-versions.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Download Old Versions &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/download/download-archive.html b/content/mavibot/download/download-archive.html
index fbfeb6b..0992642 100644
--- a/content/mavibot/download/download-archive.html
+++ b/content/mavibot/download/download-archive.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Archive &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/download/download-sources.html b/content/mavibot/download/download-sources.html
index 36bd4de..a443d5a 100644
--- a/content/mavibot/download/download-sources.html
+++ b/content/mavibot/download/download-sources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Downloads for Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/downloads.html b/content/mavibot/downloads.html
index bc34694..55378dc 100644
--- a/content/mavibot/downloads.html
+++ b/content/mavibot/downloads.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Mavibot Downloads &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/five-minutes-tutorial.html b/content/mavibot/five-minutes-tutorial.html
index 38e2979..3cded98 100644
--- a/content/mavibot/five-minutes-tutorial.html
+++ b/content/mavibot/five-minutes-tutorial.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Five Minutes Tutorial &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/index.html b/content/mavibot/index.html
index 9a53749..23ff774 100644
--- a/content/mavibot/index.html
+++ b/content/mavibot/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to Apache Mavibot &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/news.html b/content/mavibot/news.html
index 5ecbea5..0c82442 100644
--- a/content/mavibot/news.html
+++ b/content/mavibot/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide.html b/content/mavibot/user-guide.html
index 0489d3f..d2f88db 100644
--- a/content/mavibot/user-guide.html
+++ b/content/mavibot/user-guide.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Users Guide &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/1-introduction.html b/content/mavibot/user-guide/1-introduction.html
index c1d78df..c2d9349 100644
--- a/content/mavibot/user-guide/1-introduction.html
+++ b/content/mavibot/user-guide/1-introduction.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1 - Introduction &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/1.1-btree-basics.html b/content/mavibot/user-guide/1.1-btree-basics.html
index 336e7f4..93694f3 100644
--- a/content/mavibot/user-guide/1.1-btree-basics.html
+++ b/content/mavibot/user-guide/1.1-btree-basics.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>1.1 - B-tree Basics &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/2-btree-types.html b/content/mavibot/user-guide/2-btree-types.html
index 71f5317..a435c3d 100644
--- a/content/mavibot/user-guide/2-btree-types.html
+++ b/content/mavibot/user-guide/2-btree-types.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - B-tree Flavors &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/2.1-mvcc-btree.html b/content/mavibot/user-guide/2.1-mvcc-btree.html
index a2c093a..35915f6 100644
--- a/content/mavibot/user-guide/2.1-mvcc-btree.html
+++ b/content/mavibot/user-guide/2.1-mvcc-btree.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>2 - MVCC B-tree &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/3-btree-management.html b/content/mavibot/user-guide/3-btree-management.html
index dfa6ea8..caa94d2 100644
--- a/content/mavibot/user-guide/3-btree-management.html
+++ b/content/mavibot/user-guide/3-btree-management.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>3 - Mavibot B-tree management &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/4-btree-operations.html b/content/mavibot/user-guide/4-btree-operations.html
index 397e3a2..c6324f8 100644
--- a/content/mavibot/user-guide/4-btree-operations.html
+++ b/content/mavibot/user-guide/4-btree-operations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>4 - Mavibot B-tree operations &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/5-btree-informations.html b/content/mavibot/user-guide/5-btree-informations.html
index 69550e7..bfe58b4 100644
--- a/content/mavibot/user-guide/5-btree-informations.html
+++ b/content/mavibot/user-guide/5-btree-informations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title> &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/6-btree-configuration.html b/content/mavibot/user-guide/6-btree-configuration.html
index 72b8c5d..aeec6aa 100644
--- a/content/mavibot/user-guide/6-btree-configuration.html
+++ b/content/mavibot/user-guide/6-btree-configuration.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>6 - Mavibot B-tree configuration &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/7-btree-internals.html b/content/mavibot/user-guide/7-btree-internals.html
index 29fae85..1de632e 100644
--- a/content/mavibot/user-guide/7-btree-internals.html
+++ b/content/mavibot/user-guide/7-btree-internals.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7 - Mavibot Internals &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/7.1-logical-structure.html b/content/mavibot/user-guide/7.1-logical-structure.html
index 28c6af3..14b55c9 100644
--- a/content/mavibot/user-guide/7.1-logical-structure.html
+++ b/content/mavibot/user-guide/7.1-logical-structure.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.1 - Logical Structure &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/7.2-physical-storage.html b/content/mavibot/user-guide/7.2-physical-storage.html
index 91aa724..053b433 100644
--- a/content/mavibot/user-guide/7.2-physical-storage.html
+++ b/content/mavibot/user-guide/7.2-physical-storage.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.2 - Physical storage &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/7.3-serializations.html b/content/mavibot/user-guide/7.3-serializations.html
index b9b7e35..c95eeaa 100644
--- a/content/mavibot/user-guide/7.3-serializations.html
+++ b/content/mavibot/user-guide/7.3-serializations.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.3 - Serializations &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/user-guide/7.4-updates.html b/content/mavibot/user-guide/7.4-updates.html
index c205fe4..99bc8b7 100644
--- a/content/mavibot/user-guide/7.4-updates.html
+++ b/content/mavibot/user-guide/7.4-updates.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>7.4 - Updates &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/mavibot/vision.html b/content/mavibot/vision.html
index da46f9c..3d361ef 100644
--- a/content/mavibot/vision.html
+++ b/content/mavibot/vision.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Vision &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/turquoise.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/mavibot-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/original-project-proposal.html b/content/original-project-proposal.html
index 2d852bb..c4201c4 100644
--- a/content/original-project-proposal.html
+++ b/content/original-project-proposal.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Proposal for an Apache Directory Project &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/privacy-policy.html b/content/privacy-policy.html
index 1ed8608..18da62a 100644
--- a/content/privacy-policy.html
+++ b/content/privacy-policy.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Privacy Policy &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/references.html b/content/references.html
index 635652e..e980599 100644
--- a/content/references.html
+++ b/content/references.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>References &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/scimple.html b/content/scimple.html
index ef37d4d..7f11386 100644
--- a/content/scimple.html
+++ b/content/scimple.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Scimples &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/scimple/index.html b/content/scimple/index.html
index 9c14b88..502035f 100644
--- a/content/scimple/index.html
+++ b/content/scimple/index.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Welcome to Apache eSCIMo &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/scimple/news.html b/content/scimple/news.html
index 3db6ca6..f88455f 100644
--- a/content/scimple/news.html
+++ b/content/scimple/news.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>News &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/brown.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/api-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/security-advisories.html b/content/security-advisories.html
index 779a506..f514686 100644
--- a/content/security-advisories.html
+++ b/content/security-advisories.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Security Advisories &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 57482b9..47db274 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -154,7 +154,7 @@
   
   <url>
     <loc>https://directory.apache.org/apacheds/basic-ug/1.2-some-background.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -749,7 +749,7 @@
   
   <url>
     <loc>https://directory.apache.org/apacheds/basic-ug/4.1-mozilla-thunderbird.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -1509,7 +1509,7 @@
   
   <url>
     <loc>https://directory.apache.org/apacheds.html</loc>
-    <lastmod>2020-12-25T08:28:30+01:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -1524,7 +1524,7 @@
   
   <url>
     <loc>https://directory.apache.org/api.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -1539,7 +1539,7 @@
   
   <url>
     <loc>https://directory.apache.org/studio/changelog.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -1954,7 +1954,7 @@
   
   <url>
     <loc>https://directory.apache.org/studio/news.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -2209,7 +2209,7 @@
   
   <url>
     <loc>https://directory.apache.org/studio.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
@@ -2279,7 +2279,7 @@
   
   <url>
     <loc>https://directory.apache.org/api/user-guide.html</loc>
-    <lastmod>2020-08-08T11:25:14+02:00</lastmod>
+    <lastmod>2020-12-26T08:11:55+01:00</lastmod>
   </url>
   
   <url>
diff --git a/content/sources.html b/content/sources.html
index f4cb791..a95ed0e 100644
--- a/content/sources.html
+++ b/content/sources.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Sources &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/special-thanks.html b/content/special-thanks.html
index 24ea997..f440f96 100644
--- a/content/special-thanks.html
+++ b/content/special-thanks.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Special thanks &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/green.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/server-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/studio.html b/content/studio.html
index a8ce628..e839deb 100644
--- a/content/studio.html
+++ b/content/studio.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>Studios &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/blue.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/studio-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
diff --git a/content/studio/changelog.html b/content/studio/changelog.html
index 40bca3b..7c273ec 100644
--- a/content/studio/changelog.html
+++ b/content/studio/changelog.html
@@ -2,13 +2,15 @@
 
 <html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>ChangeLog &mdash; Apache Directory</title>
 
     <link href="/css/common.css" rel="stylesheet" type="text/css"/>
     <link href="/css/blue.css" rel="stylesheet" type="text/css"/>
 
-    <link rel="shortcut icon" href="/images/studio-icon_16x16.png">
+    <link rel="shortcut icon" href="/images/server-icon_16x16.png" />
 </head>
+
 <body>
 <div id="container">
     <div id="header">
@@ -126,6 +128,57 @@
 
             
 	<h1 id="changelog">ChangeLog</h1>
+<h2 id="apache-directory-studio-version-200-m15-april-19th-2020">Apache Directory Studio Version 2.0.0-M15 (April 19th 2020)</h2>
+<h3 id="bugs">Bugs</h3>
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1160">DIRSTUDIO-1160</a> - Attributes silently dropped and not imported when import LDIF and provider is Apache Directory LDAP API</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1194">DIRSTUDIO-1194</a> - build looks outside of repo (extra &ldquo;..&quot;)</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1195">DIRSTUDIO-1195</a> - LDIF editor, entry editor, search result edtor fail to open with ClassCastException</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1197">DIRSTUDIO-1197</a> - Connection Network check fails when using the LDAP API</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1199">DIRSTUDIO-1199</a> - 2.0.0-M14 doesn&rsquo;t display objectGUID / objectSid correctly</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1200">DIRSTUDIO-1200</a>(<a href="https://issues.apache.org/jira/browse/DIRSTUDIO-">https://issues.apache.org/jira/browse/DIRSTUDIO-</a> - LDIF export fails with &ldquo;Comparison method violates its general contract!&rdquo;</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1202">DIRSTUDIO-1202</a> - Eclipse - No perspective to switch to.</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1203">DIRSTUDIO-1203</a> - testConnectFailures fails</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1204">DIRSTUDIO-1204</a> - ImageDialog can&rsquo;t read binary data</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1205">DIRSTUDIO-1205</a> - Which platforms does Studio work with TLS?</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1210">DIRSTUDIO-1210</a> - mixed up documentation bug, in replication section of studio docs</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1211">DIRSTUDIO-1211</a> - UserCertificate attribute shown as Invalid Certificate if &ldquo;Apache&hellip; Client API&rdquo; is used</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1215">DIRSTUDIO-1215</a> - Getting invalid certificate for binary certificate field</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1217">DIRSTUDIO-1217</a> - Viewing entries broken with newer Eclipse versions</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1231">DIRSTUDIO-1231</a> - linux eclipse swt ClassCastException LDAPBrowser TableEditor</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1233">DIRSTUDIO-1233</a> - NullPointerException within class EntryEditor.java</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1234">DIRSTUDIO-1234</a> - Image Editor (still) does not work correctly</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1240">DIRSTUDIO-1240</a> - Directory Studio displays &ldquo;Invalid Certificate&rdquo; after userCertificate upload</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1243">DIRSTUDIO-1243</a> - Certificate Parsing Fails under Java 11</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1246">DIRSTUDIO-1246</a> - Attribute export is different in version M13 and M14</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1247">DIRSTUDIO-1247</a> - Fix high memory usage in clipboard code</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1249">DIRSTUDIO-1249</a> - UTF-8 encoding problem</li>
+</ul>
+<h3 id="new-features">New Features</h3>
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-648">DIRSTUDIO-648</a> - Studio should support the Password Modify Extended Operation according to RFC 3062</li>
+</ul>
+<h3 id="improvements">Improvements</h3>
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1124">DIRSTUDIO-1124</a> - Fix the user guide that still show how to configure ApacheDS 1.5.x&hellip;</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1150">DIRSTUDIO-1150</a> - Add a configation option for the connection timeout</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1207">DIRSTUDIO-1207</a> - Remove JNDI provider and JNDI layer</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1213">DIRSTUDIO-1213</a> - Support OSX Dark Mode</li>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1236">DIRSTUDIO-1236</a> - directory.apache.org refers to outdated &ldquo;Mac OS X&rdquo;, which is now &ldquo;macOS&rdquo;</li>
+</ul>
+<h3 id="tasks">Tasks</h3>
+<ul>
+<li><a href="https://issues.apache.org/jira/browse/DIRSTUDIO-1222">DIRSTUDIO-1222</a> - Update to Eclipse 2020-03</li>
+</ul>
+<h3 id="questions">Questions</h3>
... 542 lines suppressed ...