Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #806 from zanata/fix-doc
Browse files Browse the repository at this point in the history
Fix broken link and images
  • Loading branch information
Alex Eng committed May 13, 2015
2 parents 57b6249 + 8281d5f commit f6b5c75
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 30 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/glossary-edit-windows.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/glossary-panel.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/release-notes.md
Expand Up @@ -107,7 +107,7 @@ As it is a _prototype_, there are bound to be some bugs and sub-optimal behaviou

<h5>Infrastructure Changes</h5>

Zanata now requires JMS to be configured in standalone.xml in order to queue up some messages going out of the system. For instructions on how to do this, please [See Here](configuration/jms-messaging)
Zanata now requires JMS to be configured in standalone.xml in order to queue up some messages going out of the system. For instructions on how to do this, please [See Here](user-guide/system-admin/configuration/jms-messaging)

<h5>Drupal Plugin</h5>
* [1078009](https://bugzilla.redhat.com/show_bug.cgi?id=1078009) - PROTOTYPE: Drupal plugin to push and pull Zanata translations
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/documents/upload-documents.md
Expand Up @@ -2,7 +2,7 @@

Anyone with an account on Zanata can create a translation project for their documents.

You will need to [Create a project](projects/create-project) and [Create a version](versions/create-version) to upload strings.
You will need to [Create a project](user-guide/projects/create-project) and [Create a version](user-guide/versions/create-version) to upload strings.

------------

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/editor/editor-view.md
Expand Up @@ -109,7 +109,7 @@ You will be restricted to only viewing source and translations in the editor.
<br/>

Translators can enable or disable validation check on their translations except for those which is enforced by project maintainers.
See [Project settings](user-guide/project/project-settings#validations) for more information.
See [Project settings](user-guide/projects/project-settings#validations) for more information.

See [validations](user-guide/projects/validations) all available check.

2 changes: 1 addition & 1 deletion docs/user-guide/editor/overview.md
Expand Up @@ -15,4 +15,4 @@ From left to right
1. [Editor view (default view)](user-guide/editor/editor-view)
2. [Documents view](user-guide/editor/documents-view)
3. [Project search and replace](user-guide/editor/project-search-replace-view)
4. [Keyboard shortcut](user-guide/editor/keyboard-shortcut)
4. [Keyboard shortcut](user-guide/editor/keyboard-shortcuts)
1 change: 1 addition & 0 deletions docs/user-guide/editor/project-search-replace-view.md
@@ -0,0 +1 @@
TBA
6 changes: 3 additions & 3 deletions docs/user-guide/editor/translation-history.md
@@ -1,18 +1,18 @@
User will be able to see translation history of each messages. It will display for each translation, the version number, contents and status, modified user and modified date.

### How to show translation history
In editor click on the "timer" like icon below cancel will bring up the initial view:
In editor click on the "timer" like icon below will bring up the initial view:

<figure>
<img alt="Translation history" src="images/translation-history.png" />
<img alt="Translation history" src="images/editor-history-button.png" />
</figure>
<br/>

### Comparison of two entries
If selecting exactly two entries, user will be able to compare them in a diff view:

<figure>
<img alt="Translation history comparison" src="images/translation-history-comparison.png" />
<img alt="Translation history comparison" src="images/editor-translation-history-comparison.png" />
</figure>
<br/>

Expand Down
11 changes: 3 additions & 8 deletions docs/user-guide/glossary/delete-glossaries.md
@@ -1,11 +1,5 @@
---
title: "Deleting Glossaries"
last-updated: 2014-10-30
redirect_from: "/help/glossary/glossary-delete/"
---

### Prerequisite
Requires **Glossary-admin** role. See [glossary roles and permission]({{ site.url }}/help/glossary/glossary-roles-permissions) for permission setup.
Requires **Glossary-admin** role. See [glossary roles and permission](user-guide/glossary/glossary-roles-permissions) for permission setup.

### Delete via Web UI
1. Login into Zanata
Expand All @@ -18,7 +12,8 @@ Requires **Glossary-admin** role. See [glossary roles and permission]({{ site.ur


### Delete via Zanata Maven client
The following instructions assume that you have installed and configured the Zanata Maven Plugin. Instructions for installation and configuration are available at [Installing the Maven Plugin]({{ site.url }}/help/maven-plugin/maven-plugin-install) and [Configuring the Maven Plugin]({{ site.url }}/help/maven-plugin/maven-plugin-config)
The following instructions assume that you have installed and configured the Zanata Maven Plugin.
Instructions for installation and configuration are available at [Installing Zanata client](http://zanata-client.readthedocs.org/en/latest/installation/).

**Delete glossary entries by locale**

Expand Down
14 changes: 4 additions & 10 deletions docs/user-guide/glossary/edit-glossaries.md
@@ -1,22 +1,16 @@
---
title: "Editing Glossaries"
last-updated: 2014-10-30
redirect_from: "/help/glossary/glossary-edit/"
---

### Prerequisite
See [glossary roles and permission]({{ site.url }}/help/glossary/glossary-roles-permissions) for permission setup.
See [glossary roles and permission](user-guide/glossary/glossary-roles-permissions) for permission setup.

1. Go to editor in Zanata and select a string. Instructions for opening the
translation editor can be found at [Preparing for Translation]({{ site.url }}/help/translation/preparing-for-translation).
translation editor can be found at [Preparing for Translation](user-guide/translator-guide#start-translate-a-project-version).
1. In Glossary panel (bottom right corner), click on <i class='i i--info txt--highlight'></i> icon on the glossary entry you wish to edit.
<figure>
<img alt="glossary panel" src="{{ site.url }}/images/351-glossary-panel.png" />
<img alt="glossary panel" src="images/glossary-panel.png" />
<figcaption>Glossary panel</figcaption>
</figure>

<figure>
<img alt="glossary entry window" src="{{ site.url }}/images/351-glossary-edit-windows.png" />
<img alt="glossary entry window" src="images/glossary-edit-windows.png" />
<figcaption>Glossary entry windows</figcaption>
</figure>

Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/glossary/glossary-roles-permissions.md
Expand Up @@ -14,8 +14,8 @@ Below are the summary of these 2 roles with their permission.
<tr>
<td>**Roles**</td>
<td>[Upload glossary](user-guide/glossary/upload-glossaries)</td>
<td>[Edit glossary](user-guide/glossary/edit-glossary)</td>
<td>[Delete glossary](user-guide/glossary/delete-glossary)</td>
<td>[Edit glossary](user-guide/glossary/edit-glossaries)</td>
<td>[Delete glossary](user-guide/glossary/delete-glossaries)</td>
</tr>
</th>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/project-maintainer-guide.md
@@ -1,6 +1,6 @@
Any user who has joined Zanata can upload their project to be translated.

See [signup account](user-guide/account/sign-up) and [activate account](user-guide/account/account-activate) for more information.
See [signup account](user-guide/account/account-sign-up) and [activate account](user-guide/account/account-activate) for more information.

## New project

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/projects/import-projects.md
@@ -1,7 +1,7 @@
This document will provide help when importing or migrating projects into Zanata from other translation platforms.
You need a user account on the Zanata instance you will migrate to.

See [signup account](user-guide/account/sign-up) and [activate account](user-guide/account/account-activate) for more information.
See [signup account](user-guide/account/account-sign-up) and [activate account](user-guide/account/account-activate) for more information.

## Create a project in Zanata

Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/projects/project-settings.md
Expand Up @@ -106,7 +106,7 @@ See [validation](user-guide/projects/validations) all available check.

Copy Translations attempts to reuse translations that have been entered in Zanata by matching them with untranslated strings in your project-version. These settings change the way Copy Translations behaves when a new version is created.

Refer to [the Copy Translations reference]({{ site.url }}/help/reuse/copytrans-explained) for more information.
Refer to [the Copy Translations reference](user-guide/translation-reuse/copy-trans/) for more information.

------------

Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Expand Up @@ -62,6 +62,7 @@ pages:
- ['user-guide/editor/overview.md', 'Editor', 'Overview']
- ['user-guide/editor/editor-view.md', 'Editor', 'Editor view']
- ['user-guide/editor/documents-view.md', 'Editor', 'Document view']
- ['user-guide/editor/project-search-replace-view.md', 'Editor', 'Project search replace view']
- ['user-guide/editor/keyboard-shortcuts.md', 'Editor', 'Keyboard shortcuts']
- ['user-guide/editor/translation-history.md', 'Editor', 'Translation history']
## Glossary
Expand Down

0 comments on commit f6b5c75

Please sign in to comment.