diff --git a/core/src/main/resources/lib/form/textbox.jelly b/core/src/main/resources/lib/form/textbox.jelly
index 886dd2fa6ec89983a9ac2a2079cc0209b43b9b5a..ca9ad7a518cb9b5231fc85fa5c0de6159f67d7f7 100644
--- a/core/src/main/resources/lib/form/textbox.jelly
+++ b/core/src/main/resources/lib/form/textbox.jelly
@@ -5,12 +5,19 @@
 
 	If @field is specified:
 	   no other mandatory fields.
-	   in this case, name and value are inferred from field,
+	   in this case, name and value   are inferred from field,
 	   and checkUrl is auto-generated if the check method is present.
 	Otherwise
 	   @name and @value are mandatory.
 -->
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
+  <st:documentation>
+    Generates an input field <tt>&lt;input type="text" ... /></tt>.
+
+    <st:attribute name="field">
+      Used for databinding. TBD.
+    </st:attribute>
+  </st:documentation>
   <j:set var="checkUrl" value="${h.getCheckUrl(attrs.checkUrl,descriptor,attrs.field)}" />
   <input class="setting-input ${h.ifThenElse(checkUrl!=null,'validated','')}"
          name ="${h.defaulted(attrs.name,'_.'+attrs.field)}"
diff --git a/core/src/main/resources/lib/layout/hasPermission.jelly b/core/src/main/resources/lib/layout/hasPermission.jelly
index 0df9a4b005d22da62f702da5f2589dd3235432a5..c6efa2424f0c5f7701350b8c00b42e902b73164a 100644
--- a/core/src/main/resources/lib/layout/hasPermission.jelly
+++ b/core/src/main/resources/lib/layout/hasPermission.jelly
@@ -1,9 +1,12 @@
-<!--
-  Attributes:
-   permission: the body is only rendered if permission is null, or the user has the permission
--->
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:s="jelly:stapler">
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
+  <st:documentation>
+    Renders the body only if the current user has the specified permission
+    <st:attribute name="permission" use="required" type="Permission">
+      permission object to check. If this is null, the body will be also rendered.
+    </st:attribute>
+  </st:documentation>
+
   <j:if test="${h.hasPermission(it, permission)}">
-    <d:invokeBody />
+    <d:invokeBody/>
   </j:if>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/main-panel.jelly b/core/src/main/resources/lib/layout/main-panel.jelly
index 0538daf8fe6bdc19900695ecb4934644e03acbf3..b040e441229e5ac07236646f776ad8203d343fa0 100644
--- a/core/src/main/resources/lib/layout/main-panel.jelly
+++ b/core/src/main/resources/lib/layout/main-panel.jelly
@@ -1,4 +1,8 @@
-<j:jelly xmlns:j="jelly:core" xmlns:s="jelly:stapler" xmlns:d="jelly:define">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
+  <st:documentation>
+    Generates the body as the main content part of a Hudson page.
+  </st:documentation>
+
   <j:if test="${mode=='main-panel'}">
     <a name="skip2content" />
     <d:invokeBody />
diff --git a/core/src/main/resources/lib/layout/rightspace.jelly b/core/src/main/resources/lib/layout/rightspace.jelly
index f8cf105a70d1a283d2a4ad0bf79645b6924c718d..99137b78477d4d8fb1b83bf64f06c775fbb3e31d 100644
--- a/core/src/main/resources/lib/layout/rightspace.jelly
+++ b/core/src/main/resources/lib/layout/rightspace.jelly
@@ -1,9 +1,9 @@
-<!--
+<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define" xmlns:st="jelly:stapler">
+  <st:documentation>
     Creates a space for the right-hand side of the page.
     This sticks to the right of the page even when the content overflows.
--->
-<j:jelly xmlns:j="jelly:core" xmlns:d="jelly:define">
+  </st:documentation>
   <div style="position:absolute; top:60px; right:0px; padding-top:2em; padding-right:1em">
-    <d:invokeBody />
+    <d:invokeBody/>
   </div>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/layout/taglib b/core/src/main/resources/lib/layout/taglib
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..676b74139f04800cb0a489eb3e6d2964b0b9e0c2 100644
--- a/core/src/main/resources/lib/layout/taglib
+++ b/core/src/main/resources/lib/layout/taglib
@@ -0,0 +1 @@
+Tag library that defines the basic layout of Hudson pages.
\ No newline at end of file