Skip to content

Commit

Permalink
#502 #822 Branch documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
dcoraboeuf committed Jan 4, 2022
1 parent 33d4ff0 commit c06d760
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ icons just on the right of the branch name, following any other decoration:

image::images/project-page-branch-management.png[Branch commands,600]

This allows you to have a quick access to the management of the branches in a
This allows you to have quick access to the management of the branches in a
project. Only the deletion of a branch will prompt you about your decision.

include::usage-branches-favorites.adoc[]
// ==== Branch favorites
include::feature-branches-favorites.adoc[]

include::usage-pull-requests.adoc[]
// ==== Pull requests
include::feature-pull-requests.adoc[]

[[branches-stale]]
==== Managing stale branches
Expand Down Expand Up @@ -66,4 +68,5 @@ Additional, two regular expressions can be used to add further protection agains
Note that the _Stale branches_ property can also be set programmatically using
the <<dsl-projectproperties-stale,DSL>>.

include::usage-validation-stamp-filters.adoc[]
// ==== Validation stamp filters
include::feature-validation-stamp-filters.adoc[]
8 changes: 8 additions & 0 deletions ontrack-docs/src/docs/asciidoc/feature-projects.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[[projects]]
=== Managing projects

//include::usage-home-page.adoc[]
//
//include::usage-project-favorites.adoc[]
//
//include::usage-labels.adoc[]
14 changes: 4 additions & 10 deletions ontrack-docs/src/docs/asciidoc/features.adoc
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
[[features]]
== Features

//[[basics]]
//== Basics
//
//include::usage-projects.adoc[]
//
//include::usage-branches.adoc[]
//
include::feature-projects.adoc[]

include::feature-branches.adoc[]

//include::usage-validation-stamps.adoc[]
//
//include::usage-promotion-levels.adoc[]
Expand All @@ -20,9 +17,6 @@
//
//include::usage-properties.adoc[]

[[topics]]
=== Topics

//include::usage-scm.adoc[]
//
//include::usage-git.adoc[]
Expand Down
8 changes: 0 additions & 8 deletions ontrack-docs/src/docs/asciidoc/usage-projects.adoc

This file was deleted.

0 comments on commit c06d760

Please sign in to comment.