Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jitsi #156

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ build/
ehthumbs.db
Thumbs.db
.projectile
.project
.vscode/settings.json
/ja_jp/
258 changes: 129 additions & 129 deletions ZimbraPSTMigration.adoc

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions adminconsole.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ zmprov md <domain> zimbraAdminConsoleLogoutURL <https://example.com>

== Managing Tasks

Most {product-abbrev} tasks - such as creating accounts and Classes of Service, Server Status Monitoring, Domain management, Backup Scheduling, and Session management - can be managed from the Administration Console.
Most {product-short} tasks - such as creating accounts and Classes of Service, Server Status Monitoring, Domain management, Backup Scheduling, and Session management - can be managed from the Administration Console.

Other configuration and maintenance tasks require the use of the Zimbra CLI because you cannot perform them in the Administration Console.
For example: starting and stopping services and managing the local server configuration.
Expand Down Expand Up @@ -647,8 +647,8 @@ Check <<#zimbra-pst-migration, Zimbra PST Migration>> to migrate Outlook PSTs to
.Administrator Tools and Migration Options
[cols=",a"]
|=================================================
|*{product-abbrev} Migration Wizard for Exchange/PST (32 bit)* +
*{product-abbrev} Migration Wizard for Exchange/PST (64 bit)* |
|*{product-name} Migration Wizard for Exchange/PST (32 bit)* +
*{product-name} Migration Wizard for Exchange/PST (64 bit)* |
Get `zip` files to perform a server-to-server migration of mail, calendar, and contacts from Microsoft Exchange or PST file to the {product-name} Server.
--
[WARNING]
Expand All @@ -657,15 +657,15 @@ We recommend https://zimbra.audriga.com/[_audriga_'s self-service migration solu
as a preferred alternative for all account migrations.
--

|*{product-abbrev} Migration Wizard for Domino* |
|*{product-name} Migration Wizard for Domino* |
--
[WARNING]
This package is deprecated!
We recommend https://zimbra.audriga.com/[Audriga's self-service migration solution]
as a preferred alternative for all account migrations.
--

|*Legacy {product-abbrev} Migration Wizard for Exchange* |
|*Legacy {product-name} Migration Wizard for Exchange* |
--
[WARNING]
This package is deprecated!
Expand All @@ -689,9 +689,8 @@ Customization replaces all instances of the Zimbra product name and logo.
|=================================================
|*Zimbra Connector for Outlook (32 bits)* +
*Zimbra Connector for Outlook (64 bit) (User Instructions)* |
This application enables the user's Outlook to synchronize calendar, contacts, and mail with the {product-abbrev} server.
The Zimbra Connector for Microsoft Outlook (ZCO) allows users of Microsoft Outlook to connect to the {product-abbrev} server to access {product-abbrev} business features.
Address books, Contacts, Calendars, Tasks, and mail are synced directly with the {product-abbrev} server.
This application enables Outlook to synchronize calendar, contacts, and mail with the {product-short} server and access {product-name}'s business features.
Address books, Contacts, Calendars, Tasks, and mail are synced directly with the {product-name} server.

|*(Legacy) Microsoft Outlook PST Import Tool* |
--
Expand Down
4 changes: 2 additions & 2 deletions archive.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Zimbra Archiving and Discovery is an optional feature that enables
archiving of messages that were delivered to or sent by {product-name} and
to search across mailboxes.

The installation of the archiving feature provides the {product-abbrev} discovery tool
The installation of the archiving feature provides the {product-name} discovery tool
(also known as cross mailbox search) and sets the attributes that allow
archiving to be enabled on the Zimbra MTAs.

Expand Down Expand Up @@ -206,7 +206,7 @@ Admin Console: ::
*Home -> Configure -> Global Settings -> MTA*,
from *Archiving Configuration* check *Enable archiving*

Restart {product-abbrev} from the command line
Restart {product-short} from the command line
[source,bash]
----
zmcontrol restart
Expand Down
6 changes: 3 additions & 3 deletions backuprestore.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ the last incremental backup has run.
. Change the hostname and IP address on the old server to something
else. Do not turn off the server.

=== Install {product-abbrev} on a New Server
=== Install {product-short} on a New Server

Before you begin, make sure that the new server is correctly configured
with the IP address and hostname and that {product-name} is
Expand Down Expand Up @@ -1463,7 +1463,7 @@ target area
Because the redo log for current transactions is not available, the
mailbox server is returned to the state of the last archived redo log.

. After the offline restore is complete, start {product-abbrev}.
. After the offline restore is complete, start {product-name} server.
+
[source,bash]
----
Expand Down Expand Up @@ -1552,7 +1552,7 @@ expected when the restore process is being carried out.

== Notes on Ephemeral Data

As of ZCS 8.8, ephemeral data is not backed up as part of the backup process.
As of {product-name} 8.8, ephemeral data is not backed up as part of the backup process.
Since auth tokens are ephemeral attributes, the implication is that clients
accessing accounts restored after deletion will need to re-authenticate;
auth tokens generated prior to the backup will no longer work.
Expand Down
18 changes: 9 additions & 9 deletions cmdlineutils.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Find the hostname of the Zimbra server
Start, stop and status of a HSM session.

|zmitemdatafile |
Extracts and packs tgz files that {product-abbrev} uses for REST import/export
Extracts and packs `tgz` files that {product-short} uses for REST import/export

|zmjava |
Execute Java with Zimbra-specific environment settings
Expand Down Expand Up @@ -270,7 +270,7 @@ Support tool that dumps an item's metadata in a human-readable form
Start, stop, and restart the Zimbra milter server if enabled

|zmmtaconfigdctl |
Beginning in {product-abbrev} 7.0, this command is not used. Use `zmconfigdctl`.
Beginning in {product-name} 7.0, this command is not used. Use `zmconfigdctl`.

|zmmtactl |
Start, stop, or find the status of the MTA
Expand Down Expand Up @@ -399,7 +399,7 @@ running the CLI command. To change this, type

[IMPORTANT]
The default locale on the zimbra user system account is LANG=C. This
setting is necessary for starting {product-abbrev} services. Changing the default
setting is necessary for starting {product-short} services. Changing the default
LANG=C setting may cause performance issues with amavisd-new.

=== zmprov (Provisioning)
Expand Down Expand Up @@ -2464,7 +2464,7 @@ zmcontrol [ -v -h ] command [args]
|Long Name |Short Name |Description

| | -v |
Displays {product-abbrev} software version.
Displays {product-short} software version.

| |-h |
Displays the usage options for this command.
Expand Down Expand Up @@ -2717,7 +2717,7 @@ only.
This CLI command used with options changes other passwords.

For better security and audit trails the following passwords are generated
in {product-abbrev}:
in {product-short}:

* *LDAP Admin password*. This is the master LDAP password.

Expand Down Expand Up @@ -3120,7 +3120,7 @@ Note, `mailboxd` has to be stopped and restarted for the change to take effect.

[NOTE]
If you switch to HTTPS, you use the self-signed certificate generated
during {product-abbrev} installation in /opt/zimbra/ssl/zimbra/server/server.crt. For
during {product-short} installation in /opt/zimbra/ssl/zimbra/server/server.crt. For
ZCO users, secure ZCO profiles will display Certificate Trust dialogs
unless the root CA certificate is deployed to the server. For more
information about ZCO certificates, see the Zimbra Wiki page
Expand Down Expand Up @@ -3484,7 +3484,7 @@ BLOB>` and `<END OF BLOB>` marking the start and end of the blob.
Use `zmskindeploy` to simplify the process of deploying skins for the {web-client}.
This tool processes the available skins, enables them for all users of the {product-short} deployment, and restarts the web server so that it recognizes the new skins.
////
//Linked wiki article is for ZCS prior to 8.x.
//Linked wiki article is for {product-name} prior to 8.x.
For more information about this tool, see
https://wiki.zimbra.com/index.php?title=About_Creating_ZCS_Themes.
////
Expand Down Expand Up @@ -3641,7 +3641,7 @@ zmstatctl start|stop|status|rotate

=== zmthrdump

Use `zmthrdump` to invoke a thread dump in the {product-abbrev} server process and
Use `zmthrdump` to invoke a thread dump in the {product-short} server process and
print the output file. This command also gives the option of saving the
thread dump to a file and inserts a timestamp on the logfile.

Expand Down Expand Up @@ -3885,7 +3885,7 @@ you have to make changes to Zimbra proxy after it has been installed.
See <<zimbra_proxy_server,Zimbra Proxy Server>>.

[NOTE]
Previous to {product-abbrev} 6.0, this command was called `zmproxyinit`.
Previous to {product-name} 6.0, this command was called `zmproxyinit`.

==== Syntax
[source,bash]
Expand Down
128 changes: 43 additions & 85 deletions colorandlogo.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,143 +6,101 @@ You can change the logo and base colors of the {product-short} {web-client} them
without having to customize individual {product-name} themes. This
can be done from the administration console or the CLI.

// ifdef::z9[NOTE: {only-in-classic}]

== Changing Theme Color and Logos on the {product-short} {web-client}

ifdef::z9[NOTE: This sections deals with customizations related to {web-client}. For customizations related to the {modern-client}, refer to <<branding.adoc#_customizing_modern_web_app, Customizing {modern-client}>>]
NOTE: This sections deals with customizations related to {web-client}.
For customizations related to the {modern-client}, refer to <<branding.adoc#_customizing_modern_web_app, Customizing {modern-client}>>

Base colors for themes, and custom logos can be configured as a global
setting or as a domain setting.
Base colors for themes, and custom logos can be configured as a global setting or as a domain setting.

* When the global settings are changed, the changes apply to themes on all
servers.
* When the global settings are changed, the changes apply to themes on all servers.

* When the domain settings are changed, the base color and logos for themes
on the domain are changed.
* When the domain settings are changed, the base color and logos for themes on the domain are changed.

If global settings and domain-level settings for theme base colors or logos
are not identical, the domain values are displayed for the domain.
If global settings and domain-level settings for theme base colors or logos are not identical, the domain values are displayed for the domain.

[IMPORTANT]
If the logo and base colors are customized in multi-domain {product-name}
environments, you must set a virtual host as the base color: logo
attributes are displayed based on the Host header sent by the browser.
If the logo and base colors are customized in multi-domain {product-name} environments, you must set a virtual host as the base color: logo attributes are displayed based on the Host header sent by the browser.

[NOTE]
Various Zimbra themes are included with {product-name}. Some of
these themes - such as lemongrass, Hot Rod, and Waves - have been designed
with graphics or color codes that do not change when you modify the base
color. You might want to disable those themes from user’s Theme
preferences selection.
Various themes are included with {product-name}.
Some of these themes - such as lemongrass, Hot Rod, and Waves - have been designed with graphics or color codes that do not change when you modify the base
color.
You might want to disable those themes from user’s Theme preferences selection.

=== Customizing Base Theme Colors

The following base colors in {product-short} {web-client} themes can be changed:

* The primary background color displayed in the client.
+
This color is the background of the page. Variants of the color are used
for buttons, background color of the Content and panes, tabs, and
selection highlight. In the following image, the background color
displays with the logo, the variant of the background color displays in
the login area.
This color is the background of the page.
Variants of the color are used for buttons, background color of the Content and panes, tabs, and selection highlight.
In the following image, the background color displays with the logo, the variant of the background color displays in the login area.

* The secondary color is the color used for the toolbar.
* The selection color is the color displayed for a selected item such as
a message or an item in the Overview pane.
* The foreground color is the text color displayed. The default text
color is black. The text color usually does not need to be changed.
* The selection color is the color displayed for a selected item such as a message or an item in the Overview pane.
* The foreground color is the text color displayed.
The default text color is black.
The text color usually does not need to be changed.

=== Replacing the {web-client} Logo

You can replace the logo with your company’s logo globally or per domain.

[NOTE]
*_License Policy for Logo Replacement_* +
_The Zimbra Public License does not allow removing the Zimbra logo in
the {product-short} {web-client}. Only Network Edition customers can replace Zimbra
logos that display in the {product-short} {web-client}. Therefore, only customers
of the Network Edition should use these instructions. Additional
information about the license usage can be found at https://www.zimbra.com/license/._

==== Graphics to Replace

The following logo files can be changed. Your logos must be the same
size as specified here or the image might not display correctly.
These graphic files can be saved on another server or in a directory
that is not overwritten when {product-name} is upgraded.
The following logo files can be changed. Your logos must be the same size as specified here or the image might not display correctly.
These graphic files can be saved on another server or in a directory that is not overwritten when {product-name} is upgraded.

* Company logo that displays on the login and splash screens for {product-short} {web-client} and the {product-name} administration console. The
dimension of the graphic must be exactly 300 x 30.
* Small company logo in the upper-left of the {product-short} {web-client}
application and the administration console. The dimension of the graphic
must be exactly 170 x 35.
* Company logo that displays on the login and splash screens for {product-short} {web-client} and the {product-name} administration console.
The dimension of the graphic must be exactly 300 x 30.
* Small company logo in the upper-left of the {product-short} {web-client} application and the administration console. The dimension of the graphic must be exactly 170 x 35.
* Company Web address that links from the company logos.

==== Graphics not replaced

The icon that displays in the Advanced search toolbar and the
favicon.ico that displays in the URL browser address field cannot be
changed at this time.
The icon that displays in the Advanced search toolbar and the `favicon.ico` that displays in the URL browser address field cannot be changed at this time.

=== Using the Admin Console to Modify Theme Colors and Logo

On the administration console, the Global Settings and the Domains
settings include a Themes page that can be configured to customize the
color scheme and to add a company logo and logo URL. You upload your
company logo to be used on the {product-short} {web-client} and administration
console pages.
On the administration console, the Global Settings and the Domains settings include a Themes page that can be configured to customize the color scheme and to add a company logo and logo URL.
You upload your company logo to be used on the {product-short} {web-client} and administration console pages.

==== Changing Base Theme Colors

You can either select colors from popup view of predefined colors, or
enter the six-digit hexadecimal color value for an exact color match to
set theme colors for the following categories:
You can either select colors from popup view of predefined colors, or enter the six-digit hexadecimal color value for an exact color match to set theme colors for the following categories:

* Foreground, which is the text color.
* Background, which is the primary background color displayed in the
client.
* Secondary, which is the color used for the toolbar and selection
headers in the pane.
* Selection, which is the color displayed for a selected item such as a
message, right-click, or drop down menu selection.
* Background, which is the primary background color displayed in the client.
* Secondary, which is the color used for the toolbar and selection headers in the pane.
* Selection, which is the color displayed for a selected item such as a message, right-click, or drop down menu selection.

[NOTE]
Changes to theme settings require the server theme cache to be flushed. To
flush a server, go to *Home -> Configure -> Servers* to get the list of
servers. Right-click on a server and select *Flush Cache* from the popup
menu.
Changes to theme settings require the server theme cache to be flushed.
To flush a server, go to *Home -> Configure -> Servers* to get the list of servers.
Right-click on a server and select *Flush Cache* from the popup menu.

Use the *Customize the theme colors* container to set colors for your
theme categories:
Use the *Customize the theme colors* container to set colors for your theme categories:

Admin Console: ::
*Home -> Configure -> Global Settings -> Themes* or +
*Home -> Configure -> Domains -> _domain_ -> Themes*

1. Click on the field alongside the theme category to be modified, then
use the popup color selector to define the color for your selection.
+
You can either click directly on a color, or use the entry field to
write the hexadecimal value of the color. In either case, your selection
will be displayed in the field.
1. Click on the field alongside the theme category to be modified, then use the popup color selector to define the color for your selection.
+
If you opt out of your color selections, click *reset all theme colors*
to discard your settings.
You can either click directly on a color, or use the entry field to write the hexadecimal value of the color.
In either case, your selection will be displayed in the field.
If you opt out of your color selections, click *reset all theme colors* to discard your settings.

2. Navigating away from this page results in query for save of the
settings.
2. Navigating away from this page results in query for save of the settings.
+
Click *Yes* (to save) or *No* (to discard your settings).

==== Adding Your Logo

You can replace the {product-name} logo with your company’s logo
globally or per domain from the appropriate Themes page. Your logos must
be the same size as specified in the *Graphics to Replace*
section or the images might not display correctly. The graphic files are
saved on another server or in a directory that is not overwritten when
{product-name} is upgraded.
You can replace the {product-name} logo with your company’s logo globally or per domain from the appropriate Themes page.
Your logos must be the same size as specified in the *Graphics to Replace* section or the images might not display correctly.
The graphic files are saved on another server or in a directory that is not overwritten when {product-name} is upgraded.

[NOTE]
When you configure the *Customize the logo of the
Expand Down
Loading