diff options
| author | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2023-01-01 05:47:47 -0500 |
| commit | 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 (patch) | |
| tree | bc5715fea2ff0ae8830afdee165dcaa22344f159 /etc/tutorials/TUTORIAL.cn | |
| parent | df192b5153f9d0c9b371f28f6460a038cba8a987 (diff) | |
| parent | cae528457cb862dc886a34240c9d4c73035b6659 (diff) | |
| download | emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.tar.gz emacs-3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2.zip | |
Merge from origin/emacs-29
cae528457c ; Add 2023 to copyright years.
b394359261 Improve documentation of 'isearch-open-overlay-temporary'
ab3210e709 Document 'use-package' in the 2 main manuals
# Conflicts:
# etc/refcards/ru-refcard.tex
# lib/explicit_bzero.c
# m4/explicit_bzero.m4
Diffstat (limited to 'etc/tutorials/TUTORIAL.cn')
| -rw-r--r-- | etc/tutorials/TUTORIAL.cn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn index cb430d3fdb0..73df2cff4e7 100644 --- a/etc/tutorials/TUTORIAL.cn +++ b/etc/tutorials/TUTORIAL.cn | |||
| @@ -1006,7 +1006,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 1006 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1006 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1007 | and comes with permission to distribute copies on certain conditions: | 1007 | and comes with permission to distribute copies on certain conditions: |
| 1008 | 1008 | ||
| 1009 | Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, | 1009 | Copyright (C) 1985, 1996, 1998, 2001-2023 Free Software Foundation, |
| 1010 | Inc. | 1010 | Inc. |
| 1011 | 1011 | ||
| 1012 | This file is part of GNU Emacs. | 1012 | This file is part of GNU Emacs. |
| @@ -1035,7 +1035,7 @@ using, writing, and sharing free software! | |||
| 1035 | 1035 | ||
| 1036 | 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： | 1036 | 本篇指南是 GNU Emacs 的一部分，并允许在下列条件的约束下发行其拷贝： |
| 1037 | 1037 | ||
| 1038 | Copyright (C) 1985, 1996, 1998, 2001-2022 Free Software Foundation, | 1038 | Copyright (C) 1985, 1996, 1998, 2001-2023 Free Software Foundation, |
| 1039 | Inc. | 1039 | Inc. |
| 1040 | 1040 | ||
| 1041 | 本文件为 GNU Emacs 的一部分。 | 1041 | 本文件为 GNU Emacs 的一部分。 |