Merge branch 'maint'

lisp/org-compat.el

@@ -442,6 +442,7 @@ With two arguments, return floor and remainder of their quotient."
 	   'condition-case-no-debug)
       'condition-case))
 
+;;;###autoload
 (defmacro org-check-version ()
   "Try very hard to provide sensible version strings."
   (let* ((org-dir        (org-find-library-dir "org"))

mk/server.mk

@@ -12,14 +12,26 @@ help helpall helpserver::
 	$(info )
 	$(info Maintenance)
 	$(info ===========)
-	$(info release               - clean up and create distribution archives)
-	$(info elpa                  - clean up and create ELPA archive)
-	$(info upload                - clean up and populate server directories)
+	$(info release               - clean up, create the distribution archives)
+	$(info upload-release        - clean up, populate the server with arhives)
+	$(info )
+	$(info elpa                  - clean up, create the ELPA archive)
+	$(info upload-elpa           - clean up, populate the server with ELPA)
+	$(info )
+	$(info upload                - clean up, populate the server with everything)
+	$(info upload-doc            - clean up, populate the server with docs)
+
 helpserver::
 	@echo ""
 
 #----------------------------------------------------------------------
 
+# no slash / at the end
+SERVROOT = /var/www/orgmode.org
+SERVERMK = true # or just any value at all, really
+
+#----------------------------------------------------------------------
+
 ORGCOMM  = README request-assign-future.txt lisp/ doc/
 ORGFULL  = $(ORGCOMM) Makefile \
 		      mk/default.mk mk/targets.mk mk/version.mk \