diff --git a/Documentation/doc.css b/Documentation/doc.css index 1f253d043c..a1c233393d 100644 --- a/Documentation/doc.css +++ b/Documentation/doc.css @@ -23,7 +23,7 @@ li p { margin: 0.2em 0 0.2em 0; } -.monospaced { +.listingblock > .content { border: 2px solid silver; background: #ebebeb; margin-left: 2em; diff --git a/Documentation/intro-change-screen.txt b/Documentation/intro-change-screen.txt index 887e454b12..1fd56b63b8 100644 --- a/Documentation/intro-change-screen.txt +++ b/Documentation/intro-change-screen.txt @@ -26,7 +26,7 @@ CodeScreen2 thread on the repo-discuss mailing list]. [[configuration]] Configuration -~~~~~~~~~~~~~ +------------- The new change screen is deactivated by default. It can be activated system-wide by changing the link:config-gerrit.html[gerrit.changeScreen] setting to @@ -35,7 +35,7 @@ preferences page. [[switching-between-patch-sets]] Switching between patch sets -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------- As already mentioned above, the main difference between the old and the new change screen is the fact that only one patch set is presented on the screen. @@ -49,14 +49,14 @@ screen. [[download-commands]] Download commands -~~~~~~~~~~~~~~~~~ +----------------- The download commands are moved to the 'Download' drop down box. Patch files can be downloaded as base64 encoded or zipped versions. [[quick-approve]] Quick approve -~~~~~~~~~~~~~ +------------- The so called 'Quick approve' button is some times confusing. Normal users (i.e. non-maintainers) see this as 'Verified+1' button to the right of the 'Reply' @@ -78,7 +78,7 @@ using this button, hence the name 'Quick approve'. To provide comments, the [[reply-button]] Reply button -~~~~~~~~~~~~ +------------ This button corresponds to the 'Review' button the on patch set panel on the old change screen. The only new feature: the user can optionaly send an email @@ -89,7 +89,7 @@ Key bindings: "a" to open the drop down. "ESC" to close it. [[edit-commit-message]] Edit commit message -~~~~~~~~~~~~~~~~~~~ +------------------- To edit the commit message use the 'Edit Message' button on the change header, which will open a drop-down editor box. @@ -98,7 +98,7 @@ Key bindings: "e" to open the drop down. "ESC" to close it. [[edit-change-topic]] Edit change topic -~~~~~~~~~~~~~~~~~ +----------------- To edit the topic use the edit icon to the right of the topic field. @@ -106,14 +106,14 @@ Key bindings: "t" to open the drop down. "ESC" to close it. [[abandon-restore]] Abandon or Restore changes -~~~~~~~~~~~~~~~~~~~~~~~~~~ +-------------------------- When a change is abandoned or restored, a panel appears and a comment message can be provided. [[working-with-drafts]] Working with draft changes and patch sets -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +----------------------------------------- When a change or a patch set is a draft, then three additional buttons appear on the action panel: 'Publish', 'Delete Revision', and 'Delete Change'. In the @@ -122,7 +122,7 @@ indicate that the patch set is a draft. [[draft-comments]] Highlight draft comments -~~~~~~~~~~~~~~~~~~~~~~~~ +------------------------ If a patch set has draft comments that weren't published yet, then that patch set is marked on the list in the 'Revisions' drop down list. In addition a red @@ -130,7 +130,7 @@ set is marked on the list in the 'Revisions' drop down list. In addition a red [[codemirror]] Codemirror -~~~~~~~~~~ +---------- On the user preferences page, 'Side By Side' or 'Unified Diff' view can be configured. Use the "/" key to start the CodeMirror search, like in vim. @@ -143,7 +143,7 @@ range comment for the highlighted lines. [[reviewers]] Reviewers -~~~~~~~~~ +--------- Reviewer are split into two groups: Reviewers who actually voted on the change in the 'Reviewers' field, and reviewers, who were added to the change but didn't @@ -160,7 +160,7 @@ Key bindings: "c" to add a reviewer. "ESC" to close the drop down. [[auto-refresh]] Auto refresh of change data -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------- On the new change screen polling for updates to the currently open change is activated per default. For example, if another user votes or comments on the @@ -172,7 +172,7 @@ link:config-gerrit.html[change.updateDelay] setting. [[depends-on-needed-by]] "Depends on" and "Needed by" -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +---------------------------- Dependencies and dependent changes are listed in the 'Related Changes' drop down. @@ -182,7 +182,7 @@ open the currently selected related change. [[file-table]] File table -~~~~~~~~~~ +---------- The user can now manually toggle the 'reviewed' flag per file using the check box to the left of the filename. @@ -192,7 +192,7 @@ Key bindings: "j" & "k" to navigate in the file table, and "r" to toggle the [[included-in]] Included in -~~~~~~~~~~~ +----------- To see the branches a specific change was merged into and the list of the tags a change was tagged with, use the 'Included In' drop down on the change header, @@ -202,7 +202,7 @@ Note that this list is only visible on merged changes. [[missing-features]] Missing features -~~~~~~~~~~~~~~~~ +---------------- Several features have not been implemented yet: diff --git a/Documentation/replace_macros.py b/Documentation/replace_macros.py index d382909e16..1680a470bc 100755 --- a/Documentation/replace_macros.py +++ b/Documentation/replace_macros.py @@ -41,8 +41,9 @@ GET_TITLE = '
%s
' GET_MACRO = """ ++++ +
%s -
+
+
++++ """ diff --git a/lib/asciidoctor/BUCK b/lib/asciidoctor/BUCK index d27d11aeb6..0b07b694ef 100644 --- a/lib/asciidoctor/BUCK +++ b/lib/asciidoctor/BUCK @@ -41,8 +41,8 @@ java_library( maven_jar( name = 'asciidoctor', - id = 'org.asciidoctor:asciidoctor-java-integration:0.1.3', - sha1 = '5cf21b4331d737ef0f3b3f543a7e5a343c1f27ec', + id = 'org.asciidoctor:asciidoctor-java-integration:0.1.4', + sha1 = '3596c7142fd30d7b65a0e64ba294f3d9d4bd538f', license = 'Apache2.0', visibility = [], attach_source = False,