Skip to content

Commit

Permalink
8.8.9 - Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gordyt committed Jul 18, 2018
2 parents 90c5564 + 7565fc3 commit 7f6c990
Show file tree
Hide file tree
Showing 44 changed files with 1,728 additions and 575 deletions.
9 changes: 9 additions & 0 deletions .gitignore0
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## MAC OS
.DS_Store
.Trashes
.com.apple.timemachine.supported
.fseventsd

## other
*~
*.swp
9 changes: 9 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ Zimbra Administration Guide ChangeLog

:website: https://www.zimbra.com

Version 8.8.9
-------------
.Additions and changes
- Added Voice Services section.
- Added ng-abq & ng-abq-soap Sections provided by Cine @ ZeXtras.
- Major rewrite of ng-hsm section, added more S3 compliant store types, and
support for Primary on HSM.
- General cleanup: added favicon, fixed broken links, spelling and format issues.
Version 8.7
-----------
.Additions and changes
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Synacor, Inc. provides otherwise. To view a copy of this license, visit
https://creativecommons.org/licenses/by-sa/4.0 or send a letter to Creative
Commons, PO Box 1866, Mountain View, CA 94042, USA.

Synacor, Inc., {copyright-year} +
Synacor, Inc., 2016 +
40 La Riviere Drive, Suite 300 +
Buffalo, New York 14202

Expand Down
14 changes: 11 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,19 @@ documentation into HTML files like so:

[source,bash]
----
asciidoctor -b html5 -o admin_guide.html index.adoc
asciidoctor -b html5 -D ~/repos/adminguide-ghpages/8.8.9 -o admin_guide.html index.adoc
----

Each section of the document is contained in its own file. You may use the
`index.adoc` file to generate the entire document.

The `images/` directory must also be copied to the output destination:

[source,bash]
-----
cp -r ./images ~/repos/adminguide-ghpages/8.8.9/images
-----


Additional Information
----------------------
Expand All @@ -50,9 +57,10 @@ For additional product information check the https://wiki.zimbra.com[Zimbra Wiki

License
-------
image:https://i.creativecommons.org/l/by-sa/4.0/88x31.png[CC BY-SA] Synacor, Inc., 2016
:copyright-year: 2018
image:https://i.creativecommons.org/l/by-sa/4.0/88x31.png[CC BY-SA] Synacor, Inc., {copyright-year}

(C) 2016-2017 by Synacor, Inc.
(C) 2016-{copyright-year} by Synacor, Inc.

This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
International License unless another license agreement between you and
Expand Down
8 changes: 4 additions & 4 deletions adminconsole.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ based on the rights assigned to the administrator role.
Two types of administrator accounts can be created to manage {product-name}:

* *Global Administrators* have full privileges to manage servers,
globalsettings, domains, and accounts as well as create other
global settings, domains, and accounts as well as create other
administrators. One global administrator account is created when the
software is installed. Additional global administrator accounts can be
created. You can perform administration tasks from the Administration
Expand All @@ -40,7 +40,7 @@ the following URL pattern.

. At the login screen, enter the complete administrator address - as
*[email protected]* - and the password that was configured during
serverinstallation of {product-name}.
server installation of {product-name}.
+
image::images/administration_console.png[Administration Console]

Expand Down Expand Up @@ -440,7 +440,7 @@ Rights*, *Configure Grants*, *Search Mail*.

The *Configure* screen provides the *Configure* navigation pane and the
*Configure* pages, which enable configurations for individual and/or
globalcomponents.
global components.

image::images/administration_console_configure_ui.png[Configure UI]

Expand Down Expand Up @@ -905,7 +905,7 @@ your criteria.
The *Help Center* is a reference of resources available from the online
help and documentation, which you can access with the links provided in
the *Help* *Center* screen. Use this page, also, to access community
forums and to viewexpert responses to the top migration questions.
forums and to view expert responses to the top migration questions.

image::images/administration_console_help_center_ui.png[Help Center UI]

Expand Down
6 changes: 3 additions & 3 deletions archive.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,15 @@ name when `zmconfigarchive` is run.
==== Administering the archive server

The `amavisd-new` server process controls account archiving as well as
antivirus and antispam processes. The `zmarchivectl` command can be used to
antivirus and anti-spam processes. The `zmarchivectl` command can be used to
start, stop, restart or obtain the status of the amavisd-new server process
that controls account archiving. Caution should be taken when starting or
stopping the archiving process as it is a shared server process between
archiving, antivirus, and antispam processes. Performing actions on any of
archiving, antivirus, and anti-spam processes. Performing actions on any of
them affect any of the other services that may be enabled in your
deployment.

If you want to disable archiving and not antivirus, or antispam services,
If you want to disable archiving and not antivirus, or anti-spam services,
disable the respective service either through the CLI or through the
Administration Console.

Expand Down
Loading

0 comments on commit 7f6c990

Please sign in to comment.