diff --git a/core/core-documentation.el b/core/core-documentation.el index 1f5089a16..d3c896c84 100644 --- a/core/core-documentation.el +++ b/core/core-documentation.el @@ -129,15 +129,6 @@ See `spacemacs//fetch-docs-from-root'" (div-string "
") ;; onclick below tries to send user to the same path but at a different domain ;; the href attribute is a fallback in case javascript is disabled - (doc-warning "
-

-You are viewing the documentation for the develop branch. -The documentation for the release version is -here -. -

-
") (toc-string "

Table of Contents

") (has-toc (s-index-of "Table of Contents" content)) (indx-of-div-str (or (s-index-of div-string content t) @@ -183,7 +174,7 @@ the current buffer already has headlines with - postfixes. (defun spacemacs//org-heading-annotate-custom-id () "Annotate headings with the indexes that GitHub uses for linking. `org-html-publish-to-html' will use them instead of the default #orgheadline{N}. -This way the GitHub links and the http://spacemacs.org/ links will be +This way the GitHub links and the https://develop.spacemacs.org/ links will be compatible." (let ((heading-regexp "^[\\*]+\s\\(.*\\).*$")) (goto-char (point-min)) diff --git a/core/core-spacemacs-buffer.el b/core/core-spacemacs-buffer.el index bfe5b59cb..373db7906 100644 --- a/core/core-spacemacs-buffer.el +++ b/core/core-spacemacs-buffer.el @@ -270,7 +270,7 @@ Returns height in units of line height with a minimum of 1." (let ((icons dotspacemacs-startup-buffer-show-icons) lines) (setq dotspacemacs-startup-buffer-show-icons nil) - (setq lines (with-temp-buffer + (setq lines (with-temp-buffer (spacemacs-buffer//do-insert-startupify-lists) (recentf-mode -1) (line-number-at-pos))) @@ -879,14 +879,14 @@ REAL-WIDTH: the real width of the line. If the line contains an image, the size :help-echo "Open the Spacemacs GitHub page in your browser." :mouse-face 'highlight :follow-link "\C-m" - "http://spacemacs.org") + "https://develop.spacemacs.org") (insert " ") (widget-create 'url-link :tag (propertize "Documentation" 'face 'font-lock-keyword-face) :help-echo "Open the Spacemacs documentation in your browser." :mouse-face 'highlight :follow-link "\C-m" - "http://spacemacs.org/doc/DOCUMENTATION.html") + "https://develop.spacemacs.org/doc/DOCUMENTATION.html") (insert " ") (widget-create 'url-link :tag (propertize "Gitter Chat" 'face 'font-lock-keyword-face) @@ -1385,7 +1385,7 @@ SEQ, START and END are the same arguments as for `cl-subseq'" (spacemacs-buffer//insert-warnings)) ((eq el 'recents) (spacemacs-buffer//insert-recent-files list-size)) ((and (eq el 'recents-by-project) - (fboundp 'projectile-mode)) + (fboundp 'projectile-mode)) (spacemacs-buffer//insert-recent-files-by-project list-size)) ((eq el 'todos) (spacemacs-buffer//insert-todos list-size)) ((eq el 'agenda) (spacemacs-buffer//insert-agenda list-size)) diff --git a/doc/DOCUMENTATION.org b/doc/DOCUMENTATION.org index a174c747e..e82061d76 100644 --- a/doc/DOCUMENTATION.org +++ b/doc/DOCUMENTATION.org @@ -1337,13 +1337,13 @@ over line numbers activation. Available properties: -| Property | Description | -|-----------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| =:disabled-for-modes= | list of major modes where line numbering is inhibited | -| =:enabled-for-modes= | disable for all major modes except those listed. Takes precedence over =:disabled-for-modes= | -| =:relative= | if non-nil, line numbers are relative to the position of the cursor | +| Property | Description | +|-----------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| =:disabled-for-modes= | list of major modes where line numbering is inhibited | +| =:enabled-for-modes= | disable for all major modes except those listed. Takes precedence over =:disabled-for-modes= | +| =:relative= | if non-nil, line numbers are relative to the position of the cursor | | =:visual= | if non-nil, line numbers are relative to the position of the cursor, but lines are separated by visual state - a wrapped line, for example, will be treated as more than one line. When set to t, this option takes precedence over =:relative= | -| =:size-limit-kb= | size limit in kilobytes after which line numbers are not activated | +| =:size-limit-kb= | size limit in kilobytes after which line numbers are not activated | Note that if =:enabled-for-modes= is =nil= or not specified, then the default is to enable line numbers in any =prog-mode= and =text-mode= that wasn't explicitly @@ -1602,7 +1602,7 @@ squared symbols like =🅿=. | ~SPC t E h~ | =Ⓔh= | Eh | hybrid editing style (hybrid mode) | | ~SPC t f~ | =ⓕ= | f | fill-column-indicator mode | | ~SPC t F~ | =Ⓕ= | F | auto-fill mode | -| ~SPC t G~ | =Ⓖ= | G | [[http://spacemacs.org/layers/+tags/gtags/README.html][ggtags]] mode | +| ~SPC t G~ | =Ⓖ= | G | [[https://develop.spacemacs.org/layers/+tags/gtags/README.html][ggtags]] mode | | ~SPC t g~ | =ⓖ= | g | [[https://github.com/roman/golden-ratio.el][golden-ratio]] mode | | ~SPC t h i~ | =ⓗi= | hi | toggle highlight indentation levels | | ~SPC t h c~ | =ⓗc= | hc | toggle highlight indentation current column | diff --git a/doc/FAQ.org b/doc/FAQ.org index 949a2f2a4..9966315f4 100644 --- a/doc/FAQ.org +++ b/doc/FAQ.org @@ -217,7 +217,7 @@ change your terminal color palette. More explanations can be found on This is a feature of Spacemacs, enabling you to easily escape from a lot of situations, like escaping from =insert state= to =normal state=. -The sequence of characters used can be customized. See the [[http://spacemacs.org/doc/DOCUMENTATION.html#escaping][documentation]] for +The sequence of characters used can be customized. See the [[https://develop.spacemacs.org/doc/DOCUMENTATION.html#escaping][documentation]] for more information. If you don't like this feature, you can deactivate it by adding =evil-escape= to