Merge "Add presentation about new features in Gerrit 2.9"
diff --git a/.gitignore b/.gitignore
index 42bef4e..207b48d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
target/
.project
+.pydevproject
*.html
*.pdf
diff --git a/presentations/gerrit-new-features-2.8/gerrit-new-features-2.8.txt b/presentations/gerrit-new-features-2.8/gerrit-new-features-2.8.txt
index a935d0f..071d215 100644
--- a/presentations/gerrit-new-features-2.8/gerrit-new-features-2.8.txt
+++ b/presentations/gerrit-new-features-2.8/gerrit-new-features-2.8.txt
@@ -28,7 +28,7 @@
|contributors |54 |31 |56 |34 |22
|==========================
+
-➊ without merge commits
+➊ not including merge commits
== Labels can be configured to copy scores forward to new patch sets
@@ -96,11 +96,26 @@
The Change Screen was completely redesigned and is now based on the
Gerrit REST API.
-.New Change Screen
-image:../../img/new-change-screen.png[]
+* In the new Side-By-Side Diff Screen comments can be added on code
+ blocks.
-.Old Change Screen
-image:../../img/old-change-screen.png[]
+** To insert comments in the new Side-By-Side Diff Screen select a code
+ block and press 'c'.
++
+Inserting a comment by double click does not work!
+
+* There is a new button to cherry-pick a change to another branch.
+* For identical files the reviewed flag is automatically copied to
+ new patch sets.
+
+WARNING: The new change screen in 2.8 is still beta.
+
+* Not all features that the old change screen supports are available
+ on the new change screen.
+* The design is not final yet and with Gerrit 2.9 some things will
+ look different.
+* There are known issues with the new change screen that are fixed
+ only in Gerrit 2.9
== Change Screen Preference
@@ -113,26 +128,13 @@
image:../../img/change-screen-preference.png[]
-*WARNING:* The new change screen in 2.8 is still beta.
+== New Change Screen screenshot
-* Not all features that the old change screen supports are available
- on the new change screen.
-* The design is not final yet and with Gerrit 2.9 some things will
- look different.
-* There are known issues with the new change screen that are fixed
- only in Gerrit 2.9
+.New Change Screen
+image:../../img/new-change-screen.png[]
-== New features of new Change Screen / new Side-By-Side Diff Screen
-
-* In the new Side-By-Side Diff Screen comments can be added on code
- blocks.
-* There is a new button to cherry-pick a change to another branch.
-* For identical files the reviewed flag is automatically copied to
- new patch sets.
-
-*WARNING:* +
-To insert comments in the new Side-By-Side Diff Screen select a code
-block and press 'c'. Inserting a comment by double click does not work!
+.Old Change Screen
+image:../../img/old-change-screen.png[]
== REST API
diff --git a/presentations/gerrit-new-features-2.8/makeslides b/presentations/gerrit-new-features-2.8/makeslides
index b6f89fb..742a921 100755
--- a/presentations/gerrit-new-features-2.8/makeslides
+++ b/presentations/gerrit-new-features-2.8/makeslides
@@ -1 +1,20 @@
-asciidoc -a icons -a iconsdir=/opt/local/etc/asciidoc/images/icons gerrit-new-features-2.8.txt
+#!/bin/bash -ex
+
+ICON_DIRS=("/etc/asciidoc/images/icons" \
+ "/opt/local/etc/asciidoc/images/icons" \
+ "/usr/local/etc/asciidoc/images/icons")
+
+for icon_dir in "${ICON_DIRS[@]}"
+do
+ if [ -d $icon_dir ] ; then
+ ICON_DIR=$icon_dir
+ break
+ fi
+done
+
+OPTIONS=""
+if [ ! -z "$ICON_DIR" ]; then
+ OPTIONS="$OPTIONS -a icons -a iconsdir=$ICON_DIR"
+fi
+
+asciidoc $OPTIONS gerrit-new-features-2.8.txt
