diff options
| author | Shawn Pearce <sop@google.com> | 2013-05-22 17:00:57 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-05-22 17:00:57 -0700 |
| commit | 2c7acce786f4e7a83b0888fe9baed5d65114c4a3 (patch) | |
| tree | 9ae8b793c3fc48f84877c3e617675605f5328df3 /Documentation | |
| parent | 94b42aaf584531c3f5d3960556638241194bb9b8 (diff) | |
| parent | e7899c407247f6f0e8051a6b46f2fc89ae50d52f (diff) | |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Use "abbreviation" instead of "abbreviatedName" for labels
Update the 2.6 release notes
Update 2.6 release notes to include fixes from 2.5.3 and 2.5.4
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
Change-Id: If654a1444455102de0990d435a98fa313afa1699
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config-labels.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config-labels.txt b/Documentation/config-labels.txt index 9d7c469669..1ff7e24e6e 100644 --- a/Documentation/config-labels.txt +++ b/Documentation/config-labels.txt @@ -175,8 +175,8 @@ text"`. The `<#>` may be any positive or negative number with an optional leading `+`. -[[label_abbreviatedName]] -`label.Label-Name.abbreviatedName` +[[label_abbreviation]] +`label.Label-Name.abbreviation` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ An abbreviated name for a label shown as a compact column header, for |