diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-10-22 20:33:02 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-10-23 06:56:28 +0000 |
| commit | 89b7f835412ce386ba2b411ef9bd8d49fda42ba5 (patch) | |
| tree | 60da03e9418f85689ead44abb37e1ab8d523c79a /docbook | |
| parent | 6633ca1b90ea7dc891fee4ceafddbef4dc4b4c3d (diff) | |
WSDG: Update some branch name references.
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.adoc | 4 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_userinterface.adoc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.adoc b/docbook/wsdg_src/WSDG_chapter_sources.adoc index ef3c6a241a..7066fa4e7d 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.adoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.adoc @@ -62,8 +62,8 @@ Wireshark uses the following branch naming conventions: .master. Main feature development and odd-numbered development releases. -.master-x.y. -Stable release maintenance. For example, master-3.2 is used to manage the 3.2.x official releases. +.release-x.y, master-x.y. +Stable release maintenance. For example, release-3.4 is used to manage the 3.4.x official releases. Tags for major releases and release candidates consist of a “v” followed by a version number such as “v3.2.1” or “v3.2.3rc0”. Major releases additionally have a tag prefixed with “wireshark-” followed by a version number, such as “wireshark-3.2.0”. diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.adoc b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc index d2aec60a00..09068fde85 100644 --- a/docbook/wsdg_src/WSDG_chapter_userinterface.adoc +++ b/docbook/wsdg_src/WSDG_chapter_userinterface.adoc @@ -224,13 +224,13 @@ Qt Linguist resources in the _ui/qt_ in the master branch. debian:: GNU gettext resources in the _debian_ directory in the master branch. -master-_XY_:: +qt-_XY_, master-_XY_:: Qt Linguist resources in the _ui/qt_ in the _X.Y_ release branch. -For example, master-32 matches the Wireshark 3.2 release branch. +For example, qt-34 matches the Wireshark 3.2 release branch. -debian-_XY_:: -GNU gettext resources in the _debian_ directory in the _X.Y_ release branch. -For example, debian-32 matches the Wireshark 3.2 release branch. +po-_XY_, debian-_XY_:: +GNU gettext (.po) resources in the _debian_ directory in the _X.Y_ release branch. +For example, po-34 matches the Wireshark 3.4 release branch. Each week translations are automatically synchronized with the source code through the following steps: |