[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 30/33] ui/cocoa.m: Update documentation file and pathname
From: |
Peter Maydell |
Subject: |
[PULL 30/33] ui/cocoa.m: Update documentation file and pathname |
Date: |
Fri, 6 Mar 2020 11:09:56 +0000 |
We want to stop generating the old qemu-doc.html; first we
must update places that refer to it so they instead go to
our top level index.html documentation landing page.
The Cocoa UI has a menu option to bring up the documentation;
make it point to the new top level index.html instead.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Tested-by: Alex Bennée <address@hidden>
Message-id: address@hidden
---
ui/cocoa.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 747a70839af..cb556e4e668 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1174,7 +1174,7 @@ QemuCocoaView *cocoaView;
- (void) openDocumentation: (NSString *) filename
{
/* Where to look for local files */
- NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/", @"../"};
+ NSString *path_array[] = {@"../share/doc/qemu/", @"../doc/qemu/",
@"../docs/"};
NSString *full_file_path;
/* iterate thru the possible paths until the file is found */
@@ -1198,7 +1198,7 @@ QemuCocoaView *cocoaView;
{
COCOA_DEBUG("QemuCocoaAppController: showQEMUDoc\n");
- [self openDocumentation: @"qemu-doc.html"];
+ [self openDocumentation: @"index.html"];
}
/* Stretches video to fit host monitor size */
--
2.20.1
- [PULL 22/33] doc/scripts/hxtool.py: Strip trailing ':' from DEFHEADING/ARCHHEADING, (continued)
- [PULL 22/33] doc/scripts/hxtool.py: Strip trailing ':' from DEFHEADING/ARCHHEADING, Peter Maydell, 2020/03/06
- [PULL 24/33] docs: Roll -prom-env and -g target-specific info into qemu-options.hx, Peter Maydell, 2020/03/06
- [PULL 23/33] docs: Roll semihosting option information into qemu-options.hx, Peter Maydell, 2020/03/06
- [PULL 20/33] hmp-commands.hx: Add rST documentation fragments, Peter Maydell, 2020/03/06
- [PULL 25/33] scripts/hxtool-conv: Archive script used in qemu-options.hx conversion, Peter Maydell, 2020/03/06
- [PULL 27/33] qemu-options.hx: Fix up the autogenerated rST, Peter Maydell, 2020/03/06
- [PULL 29/33] docs: Generate qemu.1 manpage with Sphinx, Peter Maydell, 2020/03/06
- [PULL 19/33] docs/system: convert Texinfo documentation to rST, Peter Maydell, 2020/03/06
- [PULL 28/33] docs: Split out sections for the manpage into .rst.inc files, Peter Maydell, 2020/03/06
- [PULL 31/33] docs: Stop building qemu-doc, Peter Maydell, 2020/03/06
- [PULL 30/33] ui/cocoa.m: Update documentation file and pathname,
Peter Maydell <=
- [PULL 26/33] qemu-options.hx: Add rST documentation fragments, Peter Maydell, 2020/03/06
- [PULL 32/33] docs: Remove old texinfo sources, Peter Maydell, 2020/03/06
- [PULL 33/33] *.hx: Remove all the STEXI/ETEXI blocks, Peter Maydell, 2020/03/06
- Re: [PULL 00/33] docs queue, no-reply, 2020/03/06
- Re: [PULL 00/33] docs queue, Peter Maydell, 2020/03/06
- Re: [PULL 00/33] docs queue, no-reply, 2020/03/06