From patchwork Fri Mar 6 11:09:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184282 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7309462ile; Fri, 6 Mar 2020 03:27:40 -0800 (PST) X-Google-Smtp-Source: ADFU+vvJouyGyYLysnwdLfPCffd0mmZZtmDWygAU76DLBQw0UkkQ6Ci3w08XxsovaDy1CnVRMO0P X-Received: by 2002:a37:b8c6:: with SMTP id i189mr2416753qkf.259.1583494060498; Fri, 06 Mar 2020 03:27:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583494060; cv=none; d=google.com; s=arc-20160816; b=NFvDP82VYapCvpl6T62DPkzJLeGknMOSIJ1ew4Vmy1wpXuO38YD3AyEUHVauryERO/ fjWZuOry4jMcWYkCIpD180vAS3PMz3psyubjz6qat9EpckZnifHjXbo0K/5cHznyGG9Z /Vodz/XTc0Omb8yRPzyIyk+RmEga/6h2c835u5iEWRL5bKPeexfhQjy5TknNecrYE8Gz 7aHGIj1WS3j2TdfW3A+ZQ3DyMojjtNVZza/4adNuu7eR9c9mxuEh8X+j6HAruyqh7EYF cGMVAFsAsxUMQY51DxKamlQCDDN8e8035gNLcTMd7VKxE6NwmI3b+7P6PlTtq36bBqYr amBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ohs9Otf2cvL4qP/fbKtn8DSCDnRv4jYFVg8c3pXFWWM=; b=RP7/KSwq7RgV7FyMr6sBLpuh546CwmyeF54Gqs3dFTeYJ5yX8eimdXAbQvFtKV0mzQ WdiXIjubPGrAGzS5bAHM+UhpK/7UveipO8tC4TSJLhXL8AudKCqJnTkUcbvek5j+H17Q hCtCfx+f/Sb/kP3flCblDqPb9CKtAKg4ajvJxxlQRsRxH+JePXW1Kg5YU1vQKJYHKISY aVtsjjR3SlP4rPp8XsooneXfM7ZN8sBMhYfWyef8J7pGRBtlId9zbjhMBfqQOudhHlyx AuyYSw76YC6Bjjv+NLWxawnSucxgqP3M3Idg+DZPllRY66JlM2R3CUBRho8VpkfRYGic qTLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qSPyRwf1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n45si891102qtk.302.2020.03.06.03.27.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 03:27:40 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qSPyRwf1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAB8m-00027O-0G for patch@linaro.org; Fri, 06 Mar 2020 06:27:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40194) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAse-0004YW-BM for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:11:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAAsU-00067T-8j for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:59 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:55356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAAsT-000657-W4 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:50 -0500 Received: by mail-wm1-x333.google.com with SMTP id 6so1921439wmi.5 for ; Fri, 06 Mar 2020 03:10:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ohs9Otf2cvL4qP/fbKtn8DSCDnRv4jYFVg8c3pXFWWM=; b=qSPyRwf1u7uFQ0XcDmP1A4URqBLMI7Ew4dYcQwPEtZXTDPTAlw8uYtWTJOiAMHjYWU rRD6GnCHKZP0uaC8IcSulrdRcazLHL+qA9HW6OXp/OgJ0crNVqXNrVl0N4tkh4h1Uw68 MGhORw4HLhBGB/s5aOTlmJC2AYjbnDF/+xkN0tvB97wk5e1pwjzqQ0zxoLRbSuuPmgGN 6eXsh80dp2qcVBcQzSEXCsAQWNVGe2sSwRje+OjL6fja5bLDWkzUDv2yYXHs+CG35IT3 RiLqQArgECbJI1FF7PC4ClCBXMqA5kfx7FlwqRr3AfFNpIkpygzT1lG9chUE68LkiodY 8dhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ohs9Otf2cvL4qP/fbKtn8DSCDnRv4jYFVg8c3pXFWWM=; b=nOIBltt65HVaQZrhb1ysAC38DEekTp6RVzzMHlkCDfJ3r4Je6bTJ6asweNAV0C6fAu Zjt8EKRAzu6HU8ebu8w0vSVNbCU34QYa81Ye7Q+OWXiundz+O+qwQOO8TXfnXFNFYegR rKpn/3jpnYEgWizzwLhxqVKE4qxN0rDdnndWhW8XTeW7KxgdLCRtacsJOIwkqLfnjBOH dJ8r/3Cn6a5el4i1RanjSkufG8CxdS3a3jDThBFuhrAe3uWvOig4+zmZ4ArtZYZh+EOD e7poudFV8oocMMmoxn3jFSwcizIS6gNGr5MuFSpPh5wGjc4KzIpC78yhd/EuuwMIj7uD kaXA== X-Gm-Message-State: ANhLgQ0e/O5KiTnPO0XfQPpLcJORARmk8bJ16LPluL4QADJNg6g5UxEB ITahkzgBygW3RXTS+JpYTTcnTH6sNTqq7g== X-Received: by 2002:a7b:cb93:: with SMTP id m19mr3635698wmi.133.1583493048702; Fri, 06 Mar 2020 03:10:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y10sm12553029wma.26.2020.03.06.03.10.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 03:10:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/33] ui/cocoa.m: Update documentation file and pathname Date: Fri, 6 Mar 2020 11:09:56 +0000 Message-Id: <20200306110959.29461-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306110959.29461-1-peter.maydell@linaro.org> References: <20200306110959.29461-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-id: 20200228153619.9906-31-peter.maydell@linaro.org --- ui/cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 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 */