aboutsummaryrefslogtreecommitdiffstats
path: root/etc/tutorials/TUTORIAL.ro
diff options
context:
space:
mode:
authorPaul Eggert2018-01-01 01:13:04 -0800
committerPaul Eggert2018-01-01 01:13:04 -0800
commitbb267f17f9e1e593d8dee379aceee22d7fa42680 (patch)
tree466dfb3f8ef7587ebcb652709bd1cc05d18a92f3 /etc/tutorials/TUTORIAL.ro
parenta5835dfee139322de7aa071f1c87ef015acbecad (diff)
parent63b04c11d530f4a6a41f112d1b3ba1ed1eb81195 (diff)
downloademacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.tar.gz
emacs-bb267f17f9e1e593d8dee379aceee22d7fa42680.zip
Merge from origin/emacs-26
63b04c11d5 Fix copyright years by hand 5c7dd8a783 Update copyright year to 2018 220a9ecba1 Merge from Gnulib 312c565566 Don't add empty keyboard macro to macro ring (Bug#24992) 39ca289a7a Allow customization of decoding of "man" command f8240815ea * etc/NEWS: Add security consideration note on passphrase ... 0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ... acd289c5a4 Fix problems with indexing in User manual b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh... e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846 81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ... 7175496d7a Fix doc string of 'enable-recursive-minibuffers' 5b38406491 Fix documentation of delsel and of killing text # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
Diffstat (limited to 'etc/tutorials/TUTORIAL.ro')
-rw-r--r--etc/tutorials/TUTORIAL.ro4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index c5c25e3d2ca..f744c278e53 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -4,7 +4,7 @@ Mulţumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi şi sugestii.
4 4
5Această versiune a fost produsă plecând de la versiunea în limba 5Această versiune a fost produsă plecând de la versiunea în limba
6engleză, care este 6engleză, care este
7Copyright (c) 1985, 2013-2017 Free Software Foundation, Inc. 7Copyright (c) 1985, 2013-2018 Free Software Foundation, Inc.
8 8
9Citiţi acum versiunea românească a tutorialului de Emacs. 9Citiţi acum versiunea românească a tutorialului de Emacs.
10 10
@@ -1082,7 +1082,7 @@ continuare noţita de copyright originală în limba engleză.
1082This version of the tutorial, like GNU Emacs, is copyrighted, and 1082This version of the tutorial, like GNU Emacs, is copyrighted, and
1083comes with permission to distribute copies on certain conditions: 1083comes with permission to distribute copies on certain conditions:
1084 1084
1085Copyright (C) 1998, 2001-2017 Free Software Foundation, Inc. 1085Copyright (C) 1998, 2001-2018 Free Software Foundation, Inc.
1086 1086
1087 Permission is granted to anyone to make or distribute verbatim copies 1087 Permission is granted to anyone to make or distribute verbatim copies
1088 of this document as received, in any medium, provided that the 1088 of this document as received, in any medium, provided that the