diff --git a/jekyll-source/_data/sidebars/cmd_sidebar.yml b/jekyll-source/_data/sidebars/cmd_sidebar.yml
index 5922851..ddd90f8 100644
--- a/jekyll-source/_data/sidebars/cmd_sidebar.yml
+++ b/jekyll-source/_data/sidebars/cmd_sidebar.yml
@@ -18,6 +18,16 @@
       output: pdf
       type: frontmatter
 
+  - title: Return to...
+    output: web
+    folderitems:
+      - title: Documentation Home Page
+        url: /doc-index.html
+        output: web
+      - title: Gerrit Home Page
+        url: /index.html
+        output: web
+
   - title: "Command-line Reference"
     output: web
     folderitems:
diff --git a/jekyll-source/_data/sidebars/errors_sidebar.yml b/jekyll-source/_data/sidebars/errors_sidebar.yml
index 3924f40..493889c 100644
--- a/jekyll-source/_data/sidebars/errors_sidebar.yml
+++ b/jekyll-source/_data/sidebars/errors_sidebar.yml
@@ -18,6 +18,16 @@
       output: pdf
       type: frontmatter
 
+  - title: Return to...
+    output: web
+    folderitems:
+      - title: Documentation Home Page
+        url: /doc-index.html
+        output: web
+      - title: Gerrit Home Page
+        url: /index.html
+        output: web
+
   - title: "Error Messages"
     output: web
     folderitems:
diff --git a/jekyll-source/_data/sidebars/restapi_sidebar.yml b/jekyll-source/_data/sidebars/restapi_sidebar.yml
index 1e75805..0f41476 100644
--- a/jekyll-source/_data/sidebars/restapi_sidebar.yml
+++ b/jekyll-source/_data/sidebars/restapi_sidebar.yml
@@ -18,6 +18,16 @@
       output: pdf
       type: frontmatter
 
+  - title: Return to...
+    output: web
+    folderitems:
+      - title: Documentation Home Page
+        url: /doc-index.html
+        output: web
+      - title: Gerrit Home Page
+        url: /index.html
+        output: web
+
   - title: "REST API Reference"
     output: web
     folderitems:
diff --git a/jekyll-source/pages/gerrit/cmd-apropos.md b/jekyll-source/pages/gerrit/cmd-apropos.md
index 0d2513f..ddaebe3 100644
--- a/jekyll-source/pages/gerrit/cmd-apropos.md
+++ b/jekyll-source/pages/gerrit/cmd-apropos.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit apropos"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-apropos.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-ban-commit.md b/jekyll-source/pages/gerrit/cmd-ban-commit.md
index dde57d7..9fd38a3 100644
--- a/jekyll-source/pages/gerrit/cmd-ban-commit.md
+++ b/jekyll-source/pages/gerrit/cmd-ban-commit.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit ban-commit"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-ban-commit.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-cherry-pick.md b/jekyll-source/pages/gerrit/cmd-cherry-pick.md
index fa37a08..921eeae 100644
--- a/jekyll-source/pages/gerrit/cmd-cherry-pick.md
+++ b/jekyll-source/pages/gerrit/cmd-cherry-pick.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit-cherry-pick"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-cherry-pick.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-close-connection.md b/jekyll-source/pages/gerrit/cmd-close-connection.md
index 5af05d5..8aea23d 100644
--- a/jekyll-source/pages/gerrit/cmd-close-connection.md
+++ b/jekyll-source/pages/gerrit/cmd-close-connection.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit close-connection"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-close-connection.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-create-account.md b/jekyll-source/pages/gerrit/cmd-create-account.md
index bea2e22..68dcfe0 100644
--- a/jekyll-source/pages/gerrit/cmd-create-account.md
+++ b/jekyll-source/pages/gerrit/cmd-create-account.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit create-account"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-create-account.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-create-branch.md b/jekyll-source/pages/gerrit/cmd-create-branch.md
index d47151e..2431646 100644
--- a/jekyll-source/pages/gerrit/cmd-create-branch.md
+++ b/jekyll-source/pages/gerrit/cmd-create-branch.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit create-branch"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-create-branch.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-create-group.md b/jekyll-source/pages/gerrit/cmd-create-group.md
index 2af74d4..56fc51f 100644
--- a/jekyll-source/pages/gerrit/cmd-create-group.md
+++ b/jekyll-source/pages/gerrit/cmd-create-group.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit create-group"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-create-group.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-create-project.md b/jekyll-source/pages/gerrit/cmd-create-project.md
index fb4d9f6..35e87a6 100644
--- a/jekyll-source/pages/gerrit/cmd-create-project.md
+++ b/jekyll-source/pages/gerrit/cmd-create-project.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit create-project"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-create-project.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-flush-caches.md b/jekyll-source/pages/gerrit/cmd-flush-caches.md
index ec942ee..695ae17 100644
--- a/jekyll-source/pages/gerrit/cmd-flush-caches.md
+++ b/jekyll-source/pages/gerrit/cmd-flush-caches.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit flush-caches"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-flush-caches.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-gc.md b/jekyll-source/pages/gerrit/cmd-gc.md
index c098525..dde3dc2 100644
--- a/jekyll-source/pages/gerrit/cmd-gc.md
+++ b/jekyll-source/pages/gerrit/cmd-gc.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit gc"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-gc.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-gsql.md b/jekyll-source/pages/gerrit/cmd-gsql.md
index 8d5b9f0..d50a6e4 100644
--- a/jekyll-source/pages/gerrit/cmd-gsql.md
+++ b/jekyll-source/pages/gerrit/cmd-gsql.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit gsql"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-gsql.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-hook-commit-msg.md b/jekyll-source/pages/gerrit/cmd-hook-commit-msg.md
index d2ef0c1..58fdaee 100644
--- a/jekyll-source/pages/gerrit/cmd-hook-commit-msg.md
+++ b/jekyll-source/pages/gerrit/cmd-hook-commit-msg.md
@@ -1,6 +1,6 @@
 ---
 title: " commit-msg Hook"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-hook-commit-msg.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-index-activate.md b/jekyll-source/pages/gerrit/cmd-index-activate.md
index 75f7a3c..a4af0cb 100644
--- a/jekyll-source/pages/gerrit/cmd-index-activate.md
+++ b/jekyll-source/pages/gerrit/cmd-index-activate.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit index activate"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-index-activate.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-index-changes.md b/jekyll-source/pages/gerrit/cmd-index-changes.md
index 19039bc..7e0eea0 100644
--- a/jekyll-source/pages/gerrit/cmd-index-changes.md
+++ b/jekyll-source/pages/gerrit/cmd-index-changes.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit index changes"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-index-changes.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-index-project.md b/jekyll-source/pages/gerrit/cmd-index-project.md
index e16e26c..5408823 100644
--- a/jekyll-source/pages/gerrit/cmd-index-project.md
+++ b/jekyll-source/pages/gerrit/cmd-index-project.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit index project"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-index-project.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-index-start.md b/jekyll-source/pages/gerrit/cmd-index-start.md
index d442aa8..1f07cb8 100644
--- a/jekyll-source/pages/gerrit/cmd-index-start.md
+++ b/jekyll-source/pages/gerrit/cmd-index-start.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit index start"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-index-start.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-index.md b/jekyll-source/pages/gerrit/cmd-index.md
index d4a8ea7..41b0ac3 100644
--- a/jekyll-source/pages/gerrit/cmd-index.md
+++ b/jekyll-source/pages/gerrit/cmd-index.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - Command Line Tools"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-index.html
 ---
 ## Client
diff --git a/jekyll-source/pages/gerrit/cmd-kill.md b/jekyll-source/pages/gerrit/cmd-kill.md
index 398e192..eb2c3b0 100644
--- a/jekyll-source/pages/gerrit/cmd-kill.md
+++ b/jekyll-source/pages/gerrit/cmd-kill.md
@@ -1,6 +1,6 @@
 ---
 title: " kill"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-kill.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-logging-ls-level.md b/jekyll-source/pages/gerrit/cmd-logging-ls-level.md
index d9d95b3..88ca847 100644
--- a/jekyll-source/pages/gerrit/cmd-logging-ls-level.md
+++ b/jekyll-source/pages/gerrit/cmd-logging-ls-level.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit logging ls-level"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-logging-ls-level.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-logging-set-level.md b/jekyll-source/pages/gerrit/cmd-logging-set-level.md
index 7787656..16c61fa 100644
--- a/jekyll-source/pages/gerrit/cmd-logging-set-level.md
+++ b/jekyll-source/pages/gerrit/cmd-logging-set-level.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit logging set-level"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-logging-set-level.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-ls-groups.md b/jekyll-source/pages/gerrit/cmd-ls-groups.md
index c53ba91..0c59c2f 100644
--- a/jekyll-source/pages/gerrit/cmd-ls-groups.md
+++ b/jekyll-source/pages/gerrit/cmd-ls-groups.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit ls-groups"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-ls-groups.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-ls-members.md b/jekyll-source/pages/gerrit/cmd-ls-members.md
index 82354d7..a897e1f 100644
--- a/jekyll-source/pages/gerrit/cmd-ls-members.md
+++ b/jekyll-source/pages/gerrit/cmd-ls-members.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit ls-members"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-ls-members.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-ls-projects.md b/jekyll-source/pages/gerrit/cmd-ls-projects.md
index cf50fed..7310e9b 100644
--- a/jekyll-source/pages/gerrit/cmd-ls-projects.md
+++ b/jekyll-source/pages/gerrit/cmd-ls-projects.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit ls-projects"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-ls-projects.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-ls-user-refs.md b/jekyll-source/pages/gerrit/cmd-ls-user-refs.md
index f172c17..ddbbbb0 100644
--- a/jekyll-source/pages/gerrit/cmd-ls-user-refs.md
+++ b/jekyll-source/pages/gerrit/cmd-ls-user-refs.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit ls-user-refs"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-ls-user-refs.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-plugin-enable.md b/jekyll-source/pages/gerrit/cmd-plugin-enable.md
index 154d962..519ad93 100644
--- a/jekyll-source/pages/gerrit/cmd-plugin-enable.md
+++ b/jekyll-source/pages/gerrit/cmd-plugin-enable.md
@@ -1,6 +1,6 @@
 ---
 title: " plugin enable"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-plugin-enable.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-plugin-install.md b/jekyll-source/pages/gerrit/cmd-plugin-install.md
index f3133ec..c114d93 100644
--- a/jekyll-source/pages/gerrit/cmd-plugin-install.md
+++ b/jekyll-source/pages/gerrit/cmd-plugin-install.md
@@ -1,6 +1,6 @@
 ---
 title: " plugin install"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-plugin-install.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-plugin-ls.md b/jekyll-source/pages/gerrit/cmd-plugin-ls.md
index 18b1a12..25c36b1 100644
--- a/jekyll-source/pages/gerrit/cmd-plugin-ls.md
+++ b/jekyll-source/pages/gerrit/cmd-plugin-ls.md
@@ -1,6 +1,6 @@
 ---
 title: " plugin ls"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-plugin-ls.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-plugin-reload.md b/jekyll-source/pages/gerrit/cmd-plugin-reload.md
index b186850..d698d79 100644
--- a/jekyll-source/pages/gerrit/cmd-plugin-reload.md
+++ b/jekyll-source/pages/gerrit/cmd-plugin-reload.md
@@ -1,6 +1,6 @@
 ---
 title: " plugin reload"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-plugin-reload.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-plugin-remove.md b/jekyll-source/pages/gerrit/cmd-plugin-remove.md
index 470fed6..b5f05d2 100644
--- a/jekyll-source/pages/gerrit/cmd-plugin-remove.md
+++ b/jekyll-source/pages/gerrit/cmd-plugin-remove.md
@@ -1,6 +1,6 @@
 ---
 title: " plugin remove"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-plugin-remove.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-query.md b/jekyll-source/pages/gerrit/cmd-query.md
index f8b134d..02cd86c 100644
--- a/jekyll-source/pages/gerrit/cmd-query.md
+++ b/jekyll-source/pages/gerrit/cmd-query.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit query"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-query.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-receive-pack.md b/jekyll-source/pages/gerrit/cmd-receive-pack.md
index 2d50904..4cedfad 100644
--- a/jekyll-source/pages/gerrit/cmd-receive-pack.md
+++ b/jekyll-source/pages/gerrit/cmd-receive-pack.md
@@ -1,6 +1,6 @@
 ---
 title: " git-receive-pack"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-receive-pack.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-rename-group.md b/jekyll-source/pages/gerrit/cmd-rename-group.md
index 67c9b6f..3502889 100644
--- a/jekyll-source/pages/gerrit/cmd-rename-group.md
+++ b/jekyll-source/pages/gerrit/cmd-rename-group.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit rename-group"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-rename-group.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-review.md b/jekyll-source/pages/gerrit/cmd-review.md
index a3ae4b6..ded74cb 100644
--- a/jekyll-source/pages/gerrit/cmd-review.md
+++ b/jekyll-source/pages/gerrit/cmd-review.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit review"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-review.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-account.md b/jekyll-source/pages/gerrit/cmd-set-account.md
index cbda7d3..37a7429 100644
--- a/jekyll-source/pages/gerrit/cmd-set-account.md
+++ b/jekyll-source/pages/gerrit/cmd-set-account.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-account"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-account.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-head.md b/jekyll-source/pages/gerrit/cmd-set-head.md
index 443b599..5e2138a 100644
--- a/jekyll-source/pages/gerrit/cmd-set-head.md
+++ b/jekyll-source/pages/gerrit/cmd-set-head.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-head"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-head.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-members.md b/jekyll-source/pages/gerrit/cmd-set-members.md
index a5db5e8..7704e08 100644
--- a/jekyll-source/pages/gerrit/cmd-set-members.md
+++ b/jekyll-source/pages/gerrit/cmd-set-members.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-members"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-members.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-project-parent.md b/jekyll-source/pages/gerrit/cmd-set-project-parent.md
index 2824d2e..693e646 100644
--- a/jekyll-source/pages/gerrit/cmd-set-project-parent.md
+++ b/jekyll-source/pages/gerrit/cmd-set-project-parent.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-project-parent"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-project-parent.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-project.md b/jekyll-source/pages/gerrit/cmd-set-project.md
index 8e03f17..74d1700 100644
--- a/jekyll-source/pages/gerrit/cmd-set-project.md
+++ b/jekyll-source/pages/gerrit/cmd-set-project.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-project"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-project.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-set-reviewers.md b/jekyll-source/pages/gerrit/cmd-set-reviewers.md
index 007dc55..4d0eb77 100644
--- a/jekyll-source/pages/gerrit/cmd-set-reviewers.md
+++ b/jekyll-source/pages/gerrit/cmd-set-reviewers.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit set-reviewers"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-set-reviewers.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-show-caches.md b/jekyll-source/pages/gerrit/cmd-show-caches.md
index 16f2212..edb1ddb 100644
--- a/jekyll-source/pages/gerrit/cmd-show-caches.md
+++ b/jekyll-source/pages/gerrit/cmd-show-caches.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit show-caches"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-show-caches.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-show-connections.md b/jekyll-source/pages/gerrit/cmd-show-connections.md
index faa895d..c4ef648 100644
--- a/jekyll-source/pages/gerrit/cmd-show-connections.md
+++ b/jekyll-source/pages/gerrit/cmd-show-connections.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit show-connections"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-show-connections.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-show-queue.md b/jekyll-source/pages/gerrit/cmd-show-queue.md
index a42bd52..cf00264 100644
--- a/jekyll-source/pages/gerrit/cmd-show-queue.md
+++ b/jekyll-source/pages/gerrit/cmd-show-queue.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit show-queue"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-show-queue.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-stream-events.md b/jekyll-source/pages/gerrit/cmd-stream-events.md
index 45fa2e3..fe79290 100644
--- a/jekyll-source/pages/gerrit/cmd-stream-events.md
+++ b/jekyll-source/pages/gerrit/cmd-stream-events.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit stream-events"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-stream-events.html
 ---
 ## SYNOPSIS
diff --git a/jekyll-source/pages/gerrit/cmd-suexec.md b/jekyll-source/pages/gerrit/cmd-suexec.md
index e7a2a68..ef676e0 100644
--- a/jekyll-source/pages/gerrit/cmd-suexec.md
+++ b/jekyll-source/pages/gerrit/cmd-suexec.md
@@ -1,6 +1,6 @@
 ---
 title: " suexec"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-suexec.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-test-submit-rule.md b/jekyll-source/pages/gerrit/cmd-test-submit-rule.md
index c26e7ea..94d6ad9 100644
--- a/jekyll-source/pages/gerrit/cmd-test-submit-rule.md
+++ b/jekyll-source/pages/gerrit/cmd-test-submit-rule.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit test-submit rule"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-test-submit-rule.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-test-submit-type.md b/jekyll-source/pages/gerrit/cmd-test-submit-type.md
index 5826a08..77d5f7f 100644
--- a/jekyll-source/pages/gerrit/cmd-test-submit-type.md
+++ b/jekyll-source/pages/gerrit/cmd-test-submit-type.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit test-submit type"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-test-submit-type.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/cmd-version.md b/jekyll-source/pages/gerrit/cmd-version.md
index 3ab36c5..a6b9f53 100644
--- a/jekyll-source/pages/gerrit/cmd-version.md
+++ b/jekyll-source/pages/gerrit/cmd-version.md
@@ -1,6 +1,6 @@
 ---
 title: " gerrit version"
-sidebar: gerritdoc_sidebar
+sidebar: cmd_sidebar
 permalink: cmd-version.html
 ---
 ## NAME
diff --git a/jekyll-source/pages/gerrit/error-branch-not-found.md b/jekyll-source/pages/gerrit/error-branch-not-found.md
index 89994bc..5d5c231 100644
--- a/jekyll-source/pages/gerrit/error-branch-not-found.md
+++ b/jekyll-source/pages/gerrit/error-branch-not-found.md
@@ -1,6 +1,6 @@
 ---
 title: " branch ... not found"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-branch-not-found.html
 ---
 With this error message Gerrit rejects to push a commit for code review
diff --git a/jekyll-source/pages/gerrit/error-change-closed.md b/jekyll-source/pages/gerrit/error-change-closed.md
index 7e458d9..35f6e0a 100644
--- a/jekyll-source/pages/gerrit/error-change-closed.md
+++ b/jekyll-source/pages/gerrit/error-change-closed.md
@@ -1,6 +1,6 @@
 ---
 title: " change ... closed"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-change-closed.html
 ---
 With this error message Gerrit rejects to push a commit or submit a
diff --git a/jekyll-source/pages/gerrit/error-change-does-not-belong-to-project.md b/jekyll-source/pages/gerrit/error-change-does-not-belong-to-project.md
index 4cb6fe4..6ea4ecd 100644
--- a/jekyll-source/pages/gerrit/error-change-does-not-belong-to-project.md
+++ b/jekyll-source/pages/gerrit/error-change-does-not-belong-to-project.md
@@ -1,6 +1,6 @@
 ---
 title: " change ... does not belong to project ..."
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-change-does-not-belong-to-project.html
 ---
 With this error message Gerrit rejects to push a commit to a change that
diff --git a/jekyll-source/pages/gerrit/error-change-not-found.md b/jekyll-source/pages/gerrit/error-change-not-found.md
index a6843d4..9bc7554 100644
--- a/jekyll-source/pages/gerrit/error-change-not-found.md
+++ b/jekyll-source/pages/gerrit/error-change-not-found.md
@@ -1,6 +1,6 @@
 ---
 title: " change ... not found"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-change-not-found.html
 ---
 With this error message Gerrit rejects to push a commit to a change that
diff --git a/jekyll-source/pages/gerrit/error-change-upload-blocked.md b/jekyll-source/pages/gerrit/error-change-upload-blocked.md
index facc972..439adaa 100644
--- a/jekyll-source/pages/gerrit/error-change-upload-blocked.md
+++ b/jekyll-source/pages/gerrit/error-change-upload-blocked.md
@@ -1,6 +1,6 @@
 ---
 title: " One or more refs/for/ names blocks change upload"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-change-upload-blocked.html
 ---
 With this error message Gerrit rejects to push a commit for code review
diff --git a/jekyll-source/pages/gerrit/error-commit-already-exists.md b/jekyll-source/pages/gerrit/error-commit-already-exists.md
index 3d3ce99..d6edd57 100644
--- a/jekyll-source/pages/gerrit/error-commit-already-exists.md
+++ b/jekyll-source/pages/gerrit/error-commit-already-exists.md
@@ -1,6 +1,6 @@
 ---
 title: " commit already exists"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-commit-already-exists.html
 ---
 With "commit already exists (as current patchset)" or "commit already
diff --git a/jekyll-source/pages/gerrit/error-contains-banned-commit.md b/jekyll-source/pages/gerrit/error-contains-banned-commit.md
index b1870bb..26fba85 100644
--- a/jekyll-source/pages/gerrit/error-contains-banned-commit.md
+++ b/jekyll-source/pages/gerrit/error-contains-banned-commit.md
@@ -1,6 +1,6 @@
 ---
 title: " contains banned commit ..."
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-contains-banned-commit.html
 ---
 With this error message Gerrit rejects to push a commit that is banned
diff --git a/jekyll-source/pages/gerrit/error-has-duplicates.md b/jekyll-source/pages/gerrit/error-has-duplicates.md
index 5652cb6..7276f30 100644
--- a/jekyll-source/pages/gerrit/error-has-duplicates.md
+++ b/jekyll-source/pages/gerrit/error-has-duplicates.md
@@ -1,6 +1,6 @@
 ---
 title: " ... has duplicates"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-has-duplicates.html
 ---
 With this error message Gerrit rejects to push a commit if its commit
diff --git a/jekyll-source/pages/gerrit/error-invalid-author.md b/jekyll-source/pages/gerrit/error-invalid-author.md
index 4e97b12..2366548 100644
--- a/jekyll-source/pages/gerrit/error-invalid-author.md
+++ b/jekyll-source/pages/gerrit/error-invalid-author.md
@@ -1,6 +1,6 @@
 ---
 title: " invalid author"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-invalid-author.html
 ---
 For every pushed commit Gerrit verifies that the e-mail address of the
diff --git a/jekyll-source/pages/gerrit/error-invalid-changeid-line.md b/jekyll-source/pages/gerrit/error-invalid-changeid-line.md
index 71e6471..4661b46 100644
--- a/jekyll-source/pages/gerrit/error-invalid-changeid-line.md
+++ b/jekyll-source/pages/gerrit/error-invalid-changeid-line.md
@@ -1,6 +1,6 @@
 ---
 title: " invalid Change-Id line format in commit message footer"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-invalid-changeid-line.html
 ---
 With this error message Gerrit rejects to push a commit if its commit
diff --git a/jekyll-source/pages/gerrit/error-invalid-committer.md b/jekyll-source/pages/gerrit/error-invalid-committer.md
index 3dfed86..8a1cee1 100644
--- a/jekyll-source/pages/gerrit/error-invalid-committer.md
+++ b/jekyll-source/pages/gerrit/error-invalid-committer.md
@@ -1,6 +1,6 @@
 ---
 title: " invalid committer"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-invalid-committer.html
 ---
 For every pushed commit Gerrit verifies that the e-mail address of the
diff --git a/jekyll-source/pages/gerrit/error-messages.md b/jekyll-source/pages/gerrit/error-messages.md
index 36c5db2..910849d 100644
--- a/jekyll-source/pages/gerrit/error-messages.md
+++ b/jekyll-source/pages/gerrit/error-messages.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - Error Messages"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-messages.html
 ---
 This page provides access to detailed explanations of Gerrit error
diff --git a/jekyll-source/pages/gerrit/error-missing-changeid.md b/jekyll-source/pages/gerrit/error-missing-changeid.md
index 7a57eb7..f08ff12 100644
--- a/jekyll-source/pages/gerrit/error-missing-changeid.md
+++ b/jekyll-source/pages/gerrit/error-missing-changeid.md
@@ -1,6 +1,6 @@
 ---
 title: " missing Change-Id in commit message footer"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-missing-changeid.html
 ---
 With this error message Gerrit rejects to push a commit to a project
diff --git a/jekyll-source/pages/gerrit/error-multiple-changeid-lines.md b/jekyll-source/pages/gerrit/error-multiple-changeid-lines.md
index ce216f8..a736a4a 100644
--- a/jekyll-source/pages/gerrit/error-multiple-changeid-lines.md
+++ b/jekyll-source/pages/gerrit/error-multiple-changeid-lines.md
@@ -1,6 +1,6 @@
 ---
 title: " multiple Change-Id lines in commit message footer"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-multiple-changeid-lines.html
 ---
 With this error message Gerrit rejects to push a commit if the commit
diff --git a/jekyll-source/pages/gerrit/error-no-common-ancestry.md b/jekyll-source/pages/gerrit/error-no-common-ancestry.md
index e8cb8d2..7df347b 100644
--- a/jekyll-source/pages/gerrit/error-no-common-ancestry.md
+++ b/jekyll-source/pages/gerrit/error-no-common-ancestry.md
@@ -1,6 +1,6 @@
 ---
 title: " no common ancestry"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-no-common-ancestry.html
 ---
 With this error message Gerrit rejects to push a commit for code review
diff --git a/jekyll-source/pages/gerrit/error-no-new-changes.md b/jekyll-source/pages/gerrit/error-no-new-changes.md
index 590916b..1964bdc 100644
--- a/jekyll-source/pages/gerrit/error-no-new-changes.md
+++ b/jekyll-source/pages/gerrit/error-no-new-changes.md
@@ -1,6 +1,6 @@
 ---
 title: " no new changes"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-no-new-changes.html
 ---
 With this error message Gerrit rejects to push a commit if the pushed
diff --git a/jekyll-source/pages/gerrit/error-non-fast-forward.md b/jekyll-source/pages/gerrit/error-non-fast-forward.md
index 685fcc1..ce5f529 100644
--- a/jekyll-source/pages/gerrit/error-non-fast-forward.md
+++ b/jekyll-source/pages/gerrit/error-non-fast-forward.md
@@ -1,6 +1,6 @@
 ---
 title: " non-fast forward"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-non-fast-forward.html
 ---
 With this error message Gerrit rejects a push if the remote branch can’t
diff --git a/jekyll-source/pages/gerrit/error-not-a-gerrit-administrator.md b/jekyll-source/pages/gerrit/error-not-a-gerrit-administrator.md
index 650ad7c..8d6099f 100644
--- a/jekyll-source/pages/gerrit/error-not-a-gerrit-administrator.md
+++ b/jekyll-source/pages/gerrit/error-not-a-gerrit-administrator.md
@@ -1,6 +1,6 @@
 ---
 title: " Not a Gerrit administrator"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-not-a-gerrit-administrator.html
 ---
 With this error message Gerrit rejects to execute an SSH command that
diff --git a/jekyll-source/pages/gerrit/error-not-allowed-to-upload-merges.md b/jekyll-source/pages/gerrit/error-not-allowed-to-upload-merges.md
index b6f2c58..53ad08f 100644
--- a/jekyll-source/pages/gerrit/error-not-allowed-to-upload-merges.md
+++ b/jekyll-source/pages/gerrit/error-not-allowed-to-upload-merges.md
@@ -1,6 +1,6 @@
 ---
 title: " you are not allowed to upload merges"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-not-allowed-to-upload-merges.html
 ---
 With this error message Gerrit rejects to push a merge commit if the
diff --git a/jekyll-source/pages/gerrit/error-not-permitted-to-create.md b/jekyll-source/pages/gerrit/error-not-permitted-to-create.md
index 4b1d722..3519111 100644
--- a/jekyll-source/pages/gerrit/error-not-permitted-to-create.md
+++ b/jekyll-source/pages/gerrit/error-not-permitted-to-create.md
@@ -1,6 +1,6 @@
 ---
 title: " Not permitted to create ..."
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-not-permitted-to-create.html
 ---
 With this error message Gerrit rejects to create a new project in Gerrit
diff --git a/jekyll-source/pages/gerrit/error-not-signed-off-by.md b/jekyll-source/pages/gerrit/error-not-signed-off-by.md
index d744ae2..8eef9ab 100644
--- a/jekyll-source/pages/gerrit/error-not-signed-off-by.md
+++ b/jekyll-source/pages/gerrit/error-not-signed-off-by.md
@@ -1,6 +1,6 @@
 ---
 title: " not Signed-off-by author/committer/uploader in commit message footer"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-not-signed-off-by.html
 ---
 Projects in Gerrit can be configured to require a
diff --git a/jekyll-source/pages/gerrit/error-not-valid-ref.md b/jekyll-source/pages/gerrit/error-not-valid-ref.md
index 8b93ab0..94be3d4 100644
--- a/jekyll-source/pages/gerrit/error-not-valid-ref.md
+++ b/jekyll-source/pages/gerrit/error-not-valid-ref.md
@@ -1,6 +1,6 @@
 ---
 title: " not valid ref"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-not-valid-ref.html
 ---
 With this error message Gerrit rejects to push a commit if the target
diff --git a/jekyll-source/pages/gerrit/error-permission-denied.md b/jekyll-source/pages/gerrit/error-permission-denied.md
index a05e26d..968a236 100644
--- a/jekyll-source/pages/gerrit/error-permission-denied.md
+++ b/jekyll-source/pages/gerrit/error-permission-denied.md
@@ -1,6 +1,6 @@
 ---
 title: " Permission denied (publickey)"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-permission-denied.html
 ---
 With this error message an SSH command to Gerrit is rejected if the SSH
diff --git a/jekyll-source/pages/gerrit/error-prohibited-by-gerrit.md b/jekyll-source/pages/gerrit/error-prohibited-by-gerrit.md
index 1651fc1..6be230d 100644
--- a/jekyll-source/pages/gerrit/error-prohibited-by-gerrit.md
+++ b/jekyll-source/pages/gerrit/error-prohibited-by-gerrit.md
@@ -1,6 +1,6 @@
 ---
 title: " prohibited by Gerrit"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-prohibited-by-gerrit.html
 ---
 This is a general error message that is returned by Gerrit if a push is
diff --git a/jekyll-source/pages/gerrit/error-project-not-found.md b/jekyll-source/pages/gerrit/error-project-not-found.md
index 8ef650b..01d356c 100644
--- a/jekyll-source/pages/gerrit/error-project-not-found.md
+++ b/jekyll-source/pages/gerrit/error-project-not-found.md
@@ -1,6 +1,6 @@
 ---
 title: " Project not found: ..."
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-project-not-found.html
 ---
 With this error message Gerrit rejects to push a commit if the git
diff --git a/jekyll-source/pages/gerrit/error-push-fails-due-to-commit-message.md b/jekyll-source/pages/gerrit/error-push-fails-due-to-commit-message.md
index f788733..d96477e 100644
--- a/jekyll-source/pages/gerrit/error-push-fails-due-to-commit-message.md
+++ b/jekyll-source/pages/gerrit/error-push-fails-due-to-commit-message.md
@@ -1,6 +1,6 @@
 ---
 title: " Push fails due to commit message"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-push-fails-due-to-commit-message.html
 ---
 If Gerrit rejects pushing a commit it is often the case that there is an
diff --git a/jekyll-source/pages/gerrit/error-same-change-id-in-multiple-changes.md b/jekyll-source/pages/gerrit/error-same-change-id-in-multiple-changes.md
index 121e72d..5a00d8e 100644
--- a/jekyll-source/pages/gerrit/error-same-change-id-in-multiple-changes.md
+++ b/jekyll-source/pages/gerrit/error-same-change-id-in-multiple-changes.md
@@ -1,6 +1,6 @@
 ---
 title: " same Change-Id in multiple changes"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-same-change-id-in-multiple-changes.html
 ---
 With this error message Gerrit rejects to push a commit if it contains
diff --git a/jekyll-source/pages/gerrit/error-too-many-commits.md b/jekyll-source/pages/gerrit/error-too-many-commits.md
index 4663c18..86f85ca 100644
--- a/jekyll-source/pages/gerrit/error-too-many-commits.md
+++ b/jekyll-source/pages/gerrit/error-too-many-commits.md
@@ -1,6 +1,6 @@
 ---
 title: " too many commits"
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-too-many-commits.html
 ---
 This error occurs when a push directly to a branch [bypassing
diff --git a/jekyll-source/pages/gerrit/error-upload-denied.md b/jekyll-source/pages/gerrit/error-upload-denied.md
index 7add8bc..322668e 100644
--- a/jekyll-source/pages/gerrit/error-upload-denied.md
+++ b/jekyll-source/pages/gerrit/error-upload-denied.md
@@ -1,6 +1,6 @@
 ---
 title: " Upload denied for project ..."
-sidebar: gerritdoc_sidebar
+sidebar: errors_sidebar
 permalink: error-upload-denied.html
 ---
 With this error message Gerrit rejects to push a commit if the pushing
diff --git a/jekyll-source/pages/gerrit/rest-api-access.md b/jekyll-source/pages/gerrit/rest-api-access.md
index 3102058..6af18b7 100644
--- a/jekyll-source/pages/gerrit/rest-api-access.md
+++ b/jekyll-source/pages/gerrit/rest-api-access.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /access/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-access.html
 ---
 This page describes the access rights related REST endpoints. Please
diff --git a/jekyll-source/pages/gerrit/rest-api-accounts.md b/jekyll-source/pages/gerrit/rest-api-accounts.md
index dfecc4c..767c651 100644
--- a/jekyll-source/pages/gerrit/rest-api-accounts.md
+++ b/jekyll-source/pages/gerrit/rest-api-accounts.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /accounts/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-accounts.html
 ---
 This page describes the account related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api-changes.md b/jekyll-source/pages/gerrit/rest-api-changes.md
index 070c9c8..263ec4f 100644
--- a/jekyll-source/pages/gerrit/rest-api-changes.md
+++ b/jekyll-source/pages/gerrit/rest-api-changes.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /changes/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-changes.html
 ---
 This page describes the change related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api-config.md b/jekyll-source/pages/gerrit/rest-api-config.md
index d192985..6fd5dec 100644
--- a/jekyll-source/pages/gerrit/rest-api-config.md
+++ b/jekyll-source/pages/gerrit/rest-api-config.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /config/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-config.html
 ---
 This page describes the config related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api-documentation.md b/jekyll-source/pages/gerrit/rest-api-documentation.md
index bddd5b0..8cca2ba 100644
--- a/jekyll-source/pages/gerrit/rest-api-documentation.md
+++ b/jekyll-source/pages/gerrit/rest-api-documentation.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /Documentation/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-documentation.html
 ---
 This page describes the documentation search related REST endpoints.
diff --git a/jekyll-source/pages/gerrit/rest-api-groups.md b/jekyll-source/pages/gerrit/rest-api-groups.md
index 4428681..278a90e 100644
--- a/jekyll-source/pages/gerrit/rest-api-groups.md
+++ b/jekyll-source/pages/gerrit/rest-api-groups.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /groups/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-groups.html
 ---
 This page describes the group related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api-plugins.md b/jekyll-source/pages/gerrit/rest-api-plugins.md
index bb7fecc..4ca7a5e 100644
--- a/jekyll-source/pages/gerrit/rest-api-plugins.md
+++ b/jekyll-source/pages/gerrit/rest-api-plugins.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /plugins/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-plugins.html
 ---
 This page describes the plugin related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api-projects.md b/jekyll-source/pages/gerrit/rest-api-projects.md
index d8f6480..b31bf30 100644
--- a/jekyll-source/pages/gerrit/rest-api-projects.md
+++ b/jekyll-source/pages/gerrit/rest-api-projects.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - /projects/ REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api-projects.html
 ---
 This page describes the project related REST endpoints. Please also take
diff --git a/jekyll-source/pages/gerrit/rest-api.md b/jekyll-source/pages/gerrit/rest-api.md
index 3b58bba..592a169 100644
--- a/jekyll-source/pages/gerrit/rest-api.md
+++ b/jekyll-source/pages/gerrit/rest-api.md
@@ -1,6 +1,6 @@
 ---
 title: " Gerrit Code Review - REST API"
-sidebar: gerritdoc_sidebar
+sidebar: restapi_sidebar
 permalink: rest-api.html
 ---
 Gerrit Code Review comes with a REST like API available over HTTP. The