diff options
| author | Eli Zaretskii | 2017-09-30 09:57:58 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-30 09:57:58 +0300 |
| commit | 63a45e8837146636d7a6113955c8419980b0855b (patch) | |
| tree | 7e94f504013b3f27275047285ca733c3a0b57a46 /admin | |
| parent | f428757cdb26cc3e47123e5c75bd689a14304997 (diff) | |
| parent | 3ab2f9bbb96d0425a9396e08b2f462de3fd7818d (diff) | |
| download | emacs-63a45e8837146636d7a6113955c8419980b0855b.tar.gz emacs-63a45e8837146636d7a6113955c8419980b0855b.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | admin/nt/README-UNDUMP.W32 | 2 | ||||
| -rw-r--r-- | admin/nt/README-ftp-server | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index b1aaee7cb60..bc3dba71716 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 | |||
| @@ -2592,4 +2592,4 @@ | |||
| 2592 | GNU General Public License for more details. | 2592 | GNU General Public License for more details. |
| 2593 | 2593 | ||
| 2594 | You should have received a copy of the GNU General Public License | 2594 | You should have received a copy of the GNU General Public License |
| 2595 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 2595 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index aa91633dd49..b6ed8eee7ec 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 | |||
| @@ -55,4 +55,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 55 | GNU General Public License for more details. | 55 | GNU General Public License for more details. |
| 56 | 56 | ||
| 57 | You should have received a copy of the GNU General Public License | 57 | You should have received a copy of the GNU General Public License |
| 58 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 58 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 5fd363c2eb5..4f156b9c0c0 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server | |||
| @@ -227,7 +227,7 @@ See the end of the file for license conditions. | |||
| 227 | The Emacs on MS Windows FAQ is distributed with Emacs (info | 227 | The Emacs on MS Windows FAQ is distributed with Emacs (info |
| 228 | manual "efaq-w32"), and at | 228 | manual "efaq-w32"), and at |
| 229 | 229 | ||
| 230 | http://www.gnu.org/software/emacs/manual/efaq-w32.html | 230 | https://www.gnu.org/software/emacs/manual/efaq-w32.html |
| 231 | 231 | ||
| 232 | In addition to the FAQ, there is a mailing list for discussing issues | 232 | In addition to the FAQ, there is a mailing list for discussing issues |
| 233 | related to the Windows port of Emacs. For information about the | 233 | related to the Windows port of Emacs. For information about the |
| @@ -274,4 +274,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 274 | GNU General Public License for more details. | 274 | GNU General Public License for more details. |
| 275 | 275 | ||
| 276 | You should have received a copy of the GNU General Public License | 276 | You should have received a copy of the GNU General Public License |
| 277 | along with GNU Emacs. If not, see http://www.gnu.org/licenses/. | 277 | along with GNU Emacs. If not, see https://www.gnu.org/licenses/. |